GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-05 05:42:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NETPOLL]: Make sure TX lock is taken with BH disabled.

Browse source 
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Morton 2006-12-09 14:01:49 -08:00 • committed by David S. Miller
parent 2653a47b89
commit e37b8d9319
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
net/core/netpoll.c
View file

@ -242,10 +242,12 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
/* don't get messages out of order, and no recursion */ /* don't get messages out of order, and no recursion */
if (skb_queue_len(&npinfo->txq) == 0 && if (skb_queue_len(&npinfo->txq) == 0 &&
npinfo->poll_owner != smp_processor_id() && npinfo->poll_owner != smp_processor_id()) {
netif_tx_trylock(dev)) { local_bh_disable(); /* Where's netif_tx_trylock_bh()? */
if (netif_tx_trylock(dev)) {
/* try until next clock tick */ /* try until next clock tick */
for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; tries > 0; --tries) { for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
tries > 0; --tries) {
if (!netif_queue_stopped(dev)) if (!netif_queue_stopped(dev))
status = dev->hard_start_xmit(skb, dev); status = dev->hard_start_xmit(skb, dev);
@ -259,6 +261,8 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
} }
netif_tx_unlock(dev); netif_tx_unlock(dev);
} }
local_bh_enable();
}
if (status != NETDEV_TX_OK) { if (status != NETDEV_TX_OK) {
skb_queue_tail(&npinfo->txq, skb); skb_queue_tail(&npinfo->txq, skb);