From: Andrew Morton <akpm@osdl.org>
Date: Sat, 9 Dec 2006 22:01:49 +0000 (-0800)
Subject: [NETPOLL]: Make sure TX lock is taken with BH disabled.
X-Git-Tag: MMI-PSA29.97-13-9~45878^2~13^2~28
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e37b8d931936f88e4b2af66304eb44e69510b86c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 8a271285f2f3..156d7fd81fec 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -242,22 +242,26 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 
 	/* don't get messages out of order, and no recursion */
 	if (skb_queue_len(&npinfo->txq) == 0 &&
-	    npinfo->poll_owner != smp_processor_id() &&
-	    netif_tx_trylock(dev)) {
-		/* try until next clock tick */
-		for (tries = jiffies_to_usecs(1)/USEC_PER_POLL; tries > 0; --tries) {
-			if (!netif_queue_stopped(dev))
-				status = dev->hard_start_xmit(skb, dev);
-
-			if (status == NETDEV_TX_OK)
-				break;
-
-			/* tickle device maybe there is some cleanup */
-			netpoll_poll(np);
-
-			udelay(USEC_PER_POLL);
+		    npinfo->poll_owner != smp_processor_id()) {
+		local_bh_disable();	/* Where's netif_tx_trylock_bh()? */
+		if (netif_tx_trylock(dev)) {
+			/* try until next clock tick */
+			for (tries = jiffies_to_usecs(1)/USEC_PER_POLL;
+					tries > 0; --tries) {
+				if (!netif_queue_stopped(dev))
+					status = dev->hard_start_xmit(skb, dev);
+
+				if (status == NETDEV_TX_OK)
+					break;
+
+				/* tickle device maybe there is some cleanup */
+				netpoll_poll(np);
+
+				udelay(USEC_PER_POLL);
+			}
+			netif_tx_unlock(dev);
 		}
-		netif_tx_unlock(dev);
+		local_bh_enable();
 	}
 
 	if (status != NETDEV_TX_OK) {