[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <97949e3e0806131814j1f22fd72oce1541511d728120@mail.gmail.com>
Date: Fri, 13 Jun 2008 18:14:55 -0700
From: "Laurent Chavey" <chavey@...gle.com>
To: davem@...emloft.net
Cc: fubar@...ibm.com, netdev@...r.kernel.org,
bonding-devel@...ts.sourceforge.net
Subject: [PATCH] bonding: Added fix for device xmit call with irq disabled <resubmit>
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@...gle.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;
}
--
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists