[patch] Patch to make net-misc/dahdi-2.5.0.2-r1 compile with kernel 3.2.0

dahdi-kernel-3.2.diff (text/plain), 1.71 KB, created by Erich Seifert on 2012-01-12 19:25:57 UTC

--- drivers/dahdi/voicebus/GpakCust.h.orig  2012-01-12 17:49:10.000000000 +0100
+++ drivers/dahdi/voicebus/GpakCust.h       2012-01-12 17:49:25.000000000 +0100
@@ -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>

--- include/dahdi/kernel.h.orig     2012-01-12 17:50:22.000000000 +0100
+++ include/dahdi/kernel.h  2012-01-12 17:50:51.000000000 +0100
@@ -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>

--- drivers/dahdi/wctc4xxp/base.c.orig	2012-01-12 18:21:27.000000000 +0100
+++ drivers/dahdi/wctc4xxp/base.c	2012-01-12 18:22:34.000000000 +0100
@@ -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,