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

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Mar 22 13:36:06 2012
New Revision: 10592

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10592
Log:
dahdi_dynamic_eth: Fix compilation on kernels < 2.6.22.

Resolves the follwing build error:
  drivers/dahdi/dahdi_dynamic_eth.c: In function ‘ztdeth_exit’:
  drivers/dahdi/dahdi_dynamic_eth.c:448: error: implicit declaration of function ‘cancel_work_sync’

RHEL kernel versions 2.6.18-238 (5.6) and greater had cancel_work_sync()
backported which is what I did my original smoke test on.

Reported-by: Oron Peled <oron.peled at xorcom.com>
Signed-off-by: Shaun Ruffell <sruffell at digium.com>

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

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=10592&r1=10591&r2=10592
==============================================================================
--- linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c (original)
+++ linux/branches/2.6/drivers/dahdi/dahdi_dynamic_eth.c Thu Mar 22 13:36:06 2012
@@ -453,7 +453,11 @@
 
 static void __exit ztdeth_exit(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
+	flush_scheduled_work();
+#else
 	cancel_work_sync(&dahdi_dynamic_eth_flush_work);
+#endif
 	dev_remove_pack(&ztdeth_ptype);
 	unregister_netdevice_notifier(&ztdeth_nblock);
 	dahdi_dynamic_unregister_driver(&ztd_eth);