a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netpoll: Rename netpoll_rx_enable/disable to netpoll_poll_disable/enable

Browse Source 
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>
This commit is contained in:
Eric W. Biederman 2014-03-27 15:39:03 -07:00 committed by David S. Miller
parent 3f4df2066b
commit 66b5552fc2
3 changed files with 12 additions and 12 deletions
include/linux
netpoll.h
net/core
dev.cnetpoll.c

8
include/linux/netpoll.h
View File

@ -47,11 +47,11 @@ struct netpoll_info {
}; };
#ifdef CONFIG_NETPOLL #ifdef CONFIG_NETPOLL
extern void netpoll_rx_disable(struct net_device *dev); extern void netpoll_poll_disable(struct net_device *dev);
extern void netpoll_rx_enable(struct net_device *dev); extern void netpoll_poll_enable(struct net_device *dev);
#else #else
static inline void netpoll_rx_disable(struct net_device *dev) { return; } static inline void netpoll_poll_disable(struct net_device *dev) { return; }
static inline void netpoll_rx_enable(struct net_device *dev) { return; } static inline void netpoll_poll_enable(struct net_device *dev) { return; }
#endif #endif
void netpoll_send_udp(struct netpoll *np, const char *msg, int len); void netpoll_send_udp(struct netpoll *np, const char *msg, int len);

8
net/core/dev.c
View File

@ -1245,7 +1245,7 @@ static int __dev_open(struct net_device *dev)
* If we don't do this there is a chance ndo_poll_controller * If we don't do this there is a chance ndo_poll_controller
* or ndo_poll may be running while we open the device * or ndo_poll may be running while we open the device
*/ */
netpoll_rx_disable(dev); netpoll_poll_disable(dev);
ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev); ret = call_netdevice_notifiers(NETDEV_PRE_UP, dev);
ret = notifier_to_errno(ret); ret = notifier_to_errno(ret);
@ -1260,7 +1260,7 @@ static int __dev_open(struct net_device *dev)
if (!ret && ops->ndo_open) if (!ret && ops->ndo_open)
ret = ops->ndo_open(dev); ret = ops->ndo_open(dev);
netpoll_rx_enable(dev); netpoll_poll_enable(dev);
if (ret) if (ret)
clear_bit(__LINK_STATE_START, &dev->state); clear_bit(__LINK_STATE_START, &dev->state);
@ -1314,7 +1314,7 @@ static int __dev_close_many(struct list_head *head)
list_for_each_entry(dev, head, close_list) { list_for_each_entry(dev, head, close_list) {
/* Temporarily disable netpoll until the interface is down */ /* Temporarily disable netpoll until the interface is down */
netpoll_rx_disable(dev); netpoll_poll_disable(dev);
call_netdevice_notifiers(NETDEV_GOING_DOWN, dev); call_netdevice_notifiers(NETDEV_GOING_DOWN, dev);
@ -1346,7 +1346,7 @@ static int __dev_close_many(struct list_head *head)
dev->flags &= ~IFF_UP; dev->flags &= ~IFF_UP;
net_dmaengine_put(); net_dmaengine_put();
netpoll_rx_enable(dev); netpoll_poll_enable(dev);
} }
return 0; return 0;

8
net/core/netpoll.c
View File

@ -214,7 +214,7 @@ static void netpoll_poll_dev(struct net_device *dev)
zap_completion_queue(); zap_completion_queue();
} }
void netpoll_rx_disable(struct net_device *dev) void netpoll_poll_disable(struct net_device *dev)
{ {
struct netpoll_info *ni; struct netpoll_info *ni;
int idx; int idx;
@ -225,9 +225,9 @@ void netpoll_rx_disable(struct net_device *dev)
down(&ni->dev_lock); down(&ni->dev_lock);
srcu_read_unlock(&netpoll_srcu, idx); srcu_read_unlock(&netpoll_srcu, idx);
} }
EXPORT_SYMBOL(netpoll_rx_disable); EXPORT_SYMBOL(netpoll_poll_disable);
void netpoll_rx_enable(struct net_device *dev) void netpoll_poll_enable(struct net_device *dev)
{ {
struct netpoll_info *ni; struct netpoll_info *ni;
rcu_read_lock(); rcu_read_lock();
@ -236,7 +236,7 @@ void netpoll_rx_enable(struct net_device *dev)
up(&ni->dev_lock); up(&ni->dev_lock);
rcu_read_unlock(); rcu_read_unlock();
} }
EXPORT_SYMBOL(netpoll_rx_enable); EXPORT_SYMBOL(netpoll_poll_enable);
static void refill_skbs(void) static void refill_skbs(void)
{ {