lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NETPOLL]: netpoll_send_skb simplify

Browse Source 
Minor netpoll_send_skb restructuring

Restructure to avoid confusing goto and move some bits out of the
retry loop.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Mackall
2005-08-11 19:25:11 -07:00
committed by David S. Miller
parent 6b0b315729
commit f0d3459d07
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
net/core/netpoll.c
View File

@@ -248,14 +248,14 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
int status; int status;
struct netpoll_info *npinfo; struct netpoll_info *npinfo;
repeat: if (!np || !np->dev || !netif_running(np->dev)) {
if(!np || !np->dev || !netif_running(np->dev)) {
__kfree_skb(skb); __kfree_skb(skb);
return; return;
} }
/* avoid recursion */
npinfo = np->dev->npinfo; npinfo = np->dev->npinfo;
/* avoid recursion */
if (npinfo->poll_owner == smp_processor_id() || if (npinfo->poll_owner == smp_processor_id() ||
np->dev->xmit_lock_owner == smp_processor_id()) { np->dev->xmit_lock_owner == smp_processor_id()) {
if (np->drop) if (np->drop)
@@ -265,29 +265,31 @@ repeat:
return; return;
} }
spin_lock(&np->dev->xmit_lock); while (1) {
np->dev->xmit_lock_owner = smp_processor_id(); spin_lock(&np->dev->xmit_lock);
np->dev->xmit_lock_owner = smp_processor_id();
/* /*
* network drivers do not expect to be called if the queue is * network drivers do not expect to be called if the queue is
* stopped. * stopped.
*/ */
if (netif_queue_stopped(np->dev)) { if (netif_queue_stopped(np->dev)) {
np->dev->xmit_lock_owner = -1;
spin_unlock(&np->dev->xmit_lock);
netpoll_poll(np);
continue;
}
status = np->dev->hard_start_xmit(skb, np->dev);
np->dev->xmit_lock_owner = -1; np->dev->xmit_lock_owner = -1;
spin_unlock(&np->dev->xmit_lock); spin_unlock(&np->dev->xmit_lock);
netpoll_poll(np); /* success */
goto repeat; if(!status)
} return;
status = np->dev->hard_start_xmit(skb, np->dev); /* transmit busy */
np->dev->xmit_lock_owner = -1;
spin_unlock(&np->dev->xmit_lock);
/* transmit busy */
if(status) {
netpoll_poll(np); netpoll_poll(np);
goto repeat;
} }
} }