[PATCH] bonding: Added fix for device xmit call with irq disabled <resubmit>

["Laurent Chavey" <chavey@google.com>]

Resubmitting. Previous patch sent with html tags.

In some rare cases (i.e. netconsole), hard_start_xmit() may be
called with interrupts disabled as such it cannot call the slave's
dev_queue_xmit() with interrupts disabled. So instead, it calls the
slave's hard_start_xmit().

Signed-off-by: Laurent Chavey <chavey@google.com>

--- linux-2.6.25.org/drivers/net/bonding/bond_main.c    2008-04-16
19:49:44.000000000 -0700
+++ linux-2.6.25/drivers/net/bonding/bond_main.c        2008-06-13
17:37:10.000000000 -0700
@@ -401,8 +401,21 @@
                skb->dev = slave_dev;
        }

-       skb->priority = 1;
-       dev_queue_xmit(skb);
+       /* priority field is used by tc qdiscs for classifying
+        * packets. See usage of TC_H_MAJ and TC_H_MIN in
+        * /net/sched/sch_*.c files.
+        */
+       skb->priority |= 1;
+
+       /* In some rare cases (i.e. netconsole), hard_start_xmit() may be
+        * called with interrupts disabled as such it cannot call the slave's
+        * dev_queue_xmit() with interrupts disabled. So instead, it calls the
+        * slave's hard_start_xmit().
+        */
+       if (unlikely(irqs_disabled()))
+               slave_dev->hard_start_xmit(skb, slave_dev);
+       else
+               dev_queue_xmit(skb);

        return 0;
 }

--