From 747f69747441a10d3030ba185924543ac5057486 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 16 Mar 2012 17:07:56 +0000 Subject: 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 Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10360 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@10531 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wctc4xxp/base.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 8b6340d..36c349f 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -493,6 +493,7 @@ wctc4xxp_skb_to_cmd(struct wcdte *wc, const struct sk_buff *skb) return cmd; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) static void wctc4xxp_net_set_multi(struct net_device *netdev) { @@ -500,6 +501,15 @@ wctc4xxp_net_set_multi(struct net_device *netdev) 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) @@ -663,7 +673,11 @@ wctc4xxp_net_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) #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, -- cgit v1.2.3