Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (32 commits)
  [NETPOLL]: Fix local_bh_enable() warning.
  [IPVS]: Make ip_vs_sync.c <= 80col wide.
  [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()
  [HAMRADIO]: Fix baycom_epp.c compile failure.
  [DCCP]: Whitespace cleanups
  [DCCP] ccid3: Fixup some type conversions related to rtts
  [DCCP] ccid3: BUG-FIX - conversion errors
  [DCCP] ccid3: Reorder packet history source file
  [DCCP] ccid3: Reorder packet history header file
  [DCCP] ccid3: Make debug output consistent
  [DCCP] ccid3: Perform history operations only after packet has been sent
  [DCCP] ccid3: TX history - remove unused field
  [DCCP] ccid3: Shift window counter computation
  [DCCP] ccid3: Sanity-check RTT samples
  [DCCP] ccid3: Initialise RTT values
  [DCCP] ccid: Deprecate ccid_hc_tx_insert_options
  [DCCP]: Warn when discarding packet due to internal errors
  [DCCP]: Only deliver to the CCID rx side in charge
  [DCCP]: Simplify TFRC calculation
  [DCCP]: Debug timeval operations
  ...

1 files changed, 18 insertions, 12 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 8a271285f2f3..a01abdd2d3ea 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -242,22 +242,28 @@ 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);
+                    npinfo->poll_owner != smp_processor_id()) {
+                unsigned long flags;
 
-                        if (status == NETDEV_TX_OK)
-                                break;
+                local_irq_save(flags);
+                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);
 
-                        /* tickle device maybe there is some cleanup */
-                        netpoll_poll(np);
+                                if (status == NETDEV_TX_OK)
+                                        break;
 
-                        udelay(USEC_PER_POLL);
+                                /* tickle device maybe there is some cleanup */
+                                netpoll_poll(np);
+
+                                udelay(USEC_PER_POLL);
+                        }
+                        netif_tx_unlock(dev);
                 }
-                netif_tx_unlock(dev);
+                local_irq_restore(flags);
         }
 
         if (status != NETDEV_TX_OK) {