diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-12-02 19:56:07 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-12-02 19:56:07 +0000 |
| commit | 6630d7bff2fa20f31d5b6b30c0e0159ad88fb995 (patch) | |
| tree | 4f3df906139bb5cb1737352c1d0314759f1bc672 | |
| parent | 42aa1a87b5c1f122557d2cf57bb3774515f151ff (diff) | |
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@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10360 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/wctc4xxp/base.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c index 3bc2cd3..29579d3 100644 --- a/drivers/dahdi/wctc4xxp/base.c +++ b/drivers/dahdi/wctc4xxp/base.c @@ -474,6 +474,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) { @@ -481,6 +482,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) @@ -644,7 +654,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, |