OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETPOLL]: netpoll_poll() cleanup 

Restructure code slightly to improve readability:
  * dereference device once
  * change obvious while() loop
  * let poll_napi() handle null list itself

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2007-11-19 19:18:11 -08:00 committed by David S. Miller
parent 0adc9add77
commit 5106930bd6
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/core/netpoll.c
View File

@ -139,16 +139,15 @@ static int poll_one_napi(struct netpoll_info *npinfo,
return budget - work; return budget - work;
} }
static void poll_napi(struct netpoll *np) static void poll_napi(struct net_device *dev)
{ {
struct netpoll_info *npinfo = np->dev->npinfo;
struct napi_struct *napi; struct napi_struct *napi;
int budget = 16; int budget = 16;
list_for_each_entry(napi, &np->dev->napi_list, dev_list) { list_for_each_entry(napi, &dev->napi_list, dev_list) {
if (napi->poll_owner != smp_processor_id() && if (napi->poll_owner != smp_processor_id() &&
spin_trylock(&napi->poll_lock)) { spin_trylock(&napi->poll_lock)) {
budget = poll_one_napi(npinfo, napi, budget); budget = poll_one_napi(dev->npinfo, napi, budget);
spin_unlock(&napi->poll_lock); spin_unlock(&napi->poll_lock);
if (!budget) if (!budget)
@ -159,30 +158,27 @@ static void poll_napi(struct netpoll *np)
static void service_arp_queue(struct netpoll_info *npi) static void service_arp_queue(struct netpoll_info *npi)
{ {
struct sk_buff *skb; if (npi) {
struct sk_buff *skb;
if (unlikely(!npi)) while ((skb = skb_dequeue(&npi->arp_tx)))
return; arp_reply(skb);
skb = skb_dequeue(&npi->arp_tx);
while (skb != NULL) {
arp_reply(skb);
skb = skb_dequeue(&npi->arp_tx);
} }
} }
void netpoll_poll(struct netpoll *np) void netpoll_poll(struct netpoll *np)
{ {
if (!np->dev || !netif_running(np->dev) || !np->dev->poll_controller) struct net_device *dev = np->dev;
if (!dev || !netif_running(dev) || !dev->poll_controller)
return; return;
/* Process pending work on NIC */ /* Process pending work on NIC */
np->dev->poll_controller(np->dev); dev->poll_controller(dev);
if (!list_empty(&np->dev->napi_list))
poll_napi(np);
service_arp_queue(np->dev->npinfo); poll_napi(dev);
service_arp_queue(dev->npinfo);
zap_completion_queue(); zap_completion_queue();
} }