[dahdi-commits] sruffell: branch linux/2.6 r10570 - /linux/branches/2.6/drivers/dahdi/

[SVN commits to the DAHDI project]

Author: sruffell
Date: Wed Mar 21 14:12:08 2012
New Revision: 10570

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10570
Log:
dahdi_dynamic_eth: Move tx packet flushing to process context.

The masterspan can be, and often is, called with interrupts disabled but
dev_queue_xmit() needs to be called with interrupts enabled. This potentially
fixes a deadlock.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10562

Modified:
    linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c

Modified: linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c?view=diff&rev=10570&r1=10569&r2=10570
==============================================================================
--- linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c Wed Mar 21 14:12:08 2012
@@ -191,15 +191,44 @@
 		spin_unlock_irqrestore(&zlock, flags);
 }
 
-
-static int ztdeth_flush(void)
+/**
+ * dahdi_dynamic_flush_work_fn - Flush all pending transactions.
+ *
+ * This function is run in a work queue since we can't guarantee interrupts
+ * will be enabled when we're called, and dev_queue_xmit() requires that
+ * interrupts be enabled.
+ *
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static void dahdi_dynamic_flush_work_fn(void *data)
+#else
+static void dahdi_dynamic_flush_work_fn(struct work_struct *work)
+#endif
 {
 	struct sk_buff *skb;
-
 	/* Handle all transmissions now */
 	while ((skb = skb_dequeue(&skbs))) {
 		dev_queue_xmit(skb);
 	}
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static DECLARE_WORK(dahdi_dynamic_eth_flush_work,
+		    dahdi_dynamic_flush_work_fn, NULL);
+#else
+static DECLARE_WORK(dahdi_dynamic_eth_flush_work,
+		    dahdi_dynamic_flush_work_fn);
+#endif
+
+/**
+ * ztdeth_flush - Flush all pending transactions.
+ *
+ * This function is called in interrupt context while processing the master
+ * span.
+ */
+static int ztdeth_flush(void)
+{
+	schedule_work(&dahdi_dynamic_eth_flush_work);
 	return 0;
 }
 
@@ -422,6 +451,7 @@
 
 static void __exit ztdeth_exit(void)
 {
+	cancel_work_sync(&dahdi_dynamic_eth_flush_work);
 	dev_remove_pack(&ztdeth_ptype);
 	unregister_netdevice_notifier(&ztdeth_nblock);
 	dahdi_dynamic_unregister_driver(&ztd_eth);