[dahdi-commits] sruffell: branch linux/2.5 r10362 - /linux/branches/2.5/drivers/dahdi/wctc4xxp/

[SVN commits to the DAHDI project]

Author: sruffell
Date: Fri Dec  2 14:05:58 2011
New Revision: 10362

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10362
Log:
wctc4xxp: Replace 'ndo_set_multicast_list' with 'set_rx_mode'

The ndo_set_multicast_list callback was removed in b81693d9, which was
first released in Linux Kernel 3.2-rc1

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

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

Modified:
    linux/branches/2.5/drivers/dahdi/wctc4xxp/base.c

Modified: linux/branches/2.5/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=10362&r1=10361&r2=10362
==============================================================================
--- linux/branches/2.5/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/branches/2.5/drivers/dahdi/wctc4xxp/base.c Fri Dec  2 14:05:58 2011
@@ -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,