Bug#659818: Quick fix

[Kevin Shanahan]

Here is my quick hack to get 2.5.0.1 working.
Probably best to update the package to 2.6.0 though.

Cheers,
Kevin Shanahan
-------------- next part --------------
diff -urN dahdi-linux-2.5.0.1+dfsg.orig/debian/patches/linux-3.2-buildfix dahdi-linux-2.5.0.1+dfsg/debian/patches/linux-3.2-buildfix
--- dahdi-linux-2.5.0.1+dfsg.orig/debian/patches/linux-3.2-buildfix	1970-01-01 09:30:00.000000000 +0930
+++ dahdi-linux-2.5.0.1+dfsg/debian/patches/linux-3.2-buildfix	2012-02-14 12:01:38.000000000 +1030
@@ -0,0 +1,58 @@
+--- a/drivers/dahdi/voicebus/GpakCust.h	2011-06-03 05:33:20.000000000 +0930
++++ b/drivers/dahdi/voicebus/GpakCust.h	2012-02-14 08:56:21.000000000 +1030
+@@ -36,6 +36,7 @@
+ #ifndef _GPAKCUST_H  /* prevent multiple inclusion */
+ #define _GPAKCUST_H
+ 
++#include <linux/module.h>
+ #include <linux/device.h>
+ #include <linux/completion.h>
+ #include <linux/workqueue.h>
+--- a/include/dahdi/kernel.h	2011-08-12 05:26:22.000000000 +0930
++++ b/include/dahdi/kernel.h	2012-02-14 08:55:42.000000000 +1030
+@@ -42,6 +42,7 @@
+ #include <linux/config.h>
+ #endif
+ #include <linux/fs.h>
++#include <linux/module.h>
+ #include <linux/kobject.h>
+ #include <linux/ioctl.h>
+ 
+--- a/drivers/dahdi/wctc4xxp/base.c	(revision 10347)
++++ b/drivers/dahdi/wctc4xxp/base.c	(revision 10360)
+@@ -474,6 +474,7 @@
+ 	return cmd;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+ static void
+ wctc4xxp_net_set_multi(struct net_device *netdev)
+ {
+@@ -481,6 +482,15 @@
+ 	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n",
+ 	   __func__, netdev->promiscuity);
+ }
++#else
++static void
++wctc4xxp_set_rx_mode(struct net_device *netdev)
++{
++	struct wcdte *wc = wcdte_from_netdev(netdev);
++	DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n",
++	   __func__, netdev->promiscuity);
++}
++#endif
+ 
+ static int
+ wctc4xxp_net_up(struct net_device *netdev)
+@@ -644,7 +654,11 @@
+ 
+ #ifdef HAVE_NET_DEVICE_OPS
+ static const struct net_device_ops wctc4xxp_netdev_ops = {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)
+ 	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
++#else
++	.ndo_set_rx_mode = &wctc4xxp_set_rx_mode,
++#endif
+ 	.ndo_open = &wctc4xxp_net_up,
+ 	.ndo_stop = &wctc4xxp_net_down,
+ 	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,
diff -urN dahdi-linux-2.5.0.1+dfsg.orig/debian/patches/series dahdi-linux-2.5.0.1+dfsg/debian/patches/series
--- dahdi-linux-2.5.0.1+dfsg.orig/debian/patches/series	2011-09-26 06:40:48.000000000 +0930
+++ dahdi-linux-2.5.0.1+dfsg/debian/patches/series	2012-02-14 12:02:05.000000000 +1030
@@ -5,3 +5,4 @@
 chanmute
 notest
 xpp_fix_2fxs6fxo
+linux-3.2-buildfix