Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netpoll: Rename netpoll_rx_enable/disable to netpoll_poll_disable/enable

The netpoll_rx_enable and netpoll_rx_disable functions have always
controlled polling the network drivers transmit and receive queues.

Rename them to netpoll_poll_enable and netpoll_poll_disable to make
their functionality clear.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric W. Biederman and committed by
David S. Miller
66b5552f 3f4df206

+12 -12
+4 -4
include/linux/netpoll.h
··· 47 47 }; 48 48 49 49 #ifdef CONFIG_NETPOLL 50 - extern void netpoll_rx_disable(struct net_device *dev); 51 - extern void netpoll_rx_enable(struct net_device *dev); 50 + extern void netpoll_poll_disable(struct net_device *dev); 51 + extern void netpoll_poll_enable(struct net_device *dev); 52 52 #else 53 - static inline void netpoll_rx_disable(struct net_device *dev) { return; } 54 - static inline void netpoll_rx_enable(struct net_device *dev) { return; } 53 + static inline void netpoll_poll_disable(struct net_device *dev) { return; } 54 + static inline void netpoll_poll_enable(struct net_device *dev) { return; } 55 55 #endif 56 56 57 57 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
+4 -4
net/core/dev.c
··· 1245 1245 * If we don't do this there is a chance ndo_poll_controller 1246 1246 * or ndo_poll may be running while we open the device 1247 1247 */ 1248 - netpoll_rx_disable(dev); 1248 + netpoll_poll_disable(dev); 1249 1249 1250 1250 ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev); 1251 1251 ret = notifier_to_errno(ret); ··· 1260 1260 if (!ret && ops->ndo_open) 1261 1261 ret = ops->ndo_open(dev); 1262 1262 1263 - netpoll_rx_enable(dev); 1263 + netpoll_poll_enable(dev); 1264 1264 1265 1265 if (ret) 1266 1266 clear_bit(__LINK_STATE_START, &dev->state); ··· 1314 1314 1315 1315 list_for_each_entry(dev, head, close_list) { 1316 1316 /* Temporarily disable netpoll until the interface is down */ 1317 - netpoll_rx_disable(dev); 1317 + netpoll_poll_disable(dev); 1318 1318 1319 1319 call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); 1320 1320 ··· 1346 1346 1347 1347 dev->flags &= ~IFF_UP; 1348 1348 net_dmaengine_put(); 1349 - netpoll_rx_enable(dev); 1349 + netpoll_poll_enable(dev); 1350 1350 } 1351 1351 1352 1352 return 0;
+4 -4
net/core/netpoll.c
··· 214 214 zap_completion_queue(); 215 215 } 216 216 217 - void netpoll_rx_disable(struct net_device *dev) 217 + void netpoll_poll_disable(struct net_device *dev) 218 218 { 219 219 struct netpoll_info *ni; 220 220 int idx; ··· 225 225 down(&ni->dev_lock); 226 226 srcu_read_unlock(&netpoll_srcu, idx); 227 227 } 228 - EXPORT_SYMBOL(netpoll_rx_disable); 228 + EXPORT_SYMBOL(netpoll_poll_disable); 229 229 230 - void netpoll_rx_enable(struct net_device *dev) 230 + void netpoll_poll_enable(struct net_device *dev) 231 231 { 232 232 struct netpoll_info *ni; 233 233 rcu_read_lock(); ··· 236 236 up(&ni->dev_lock); 237 237 rcu_read_unlock(); 238 238 } 239 - EXPORT_SYMBOL(netpoll_rx_enable); 239 + EXPORT_SYMBOL(netpoll_poll_enable); 240 240 241 241 static void refill_skbs(void) 242 242 {