From: Jiri Pirko Date: Tue, 16 Aug 2011 06:29:01 +0000 (+0000) Subject: net: remove use of ndo_set_multicast_list in drivers X-Git-Tag: bp-1.0.8.9-noasd~12 X-Git-Url: http://bbs.cooldavid.org/git/?p=jme.git;a=commitdiff_plain;h=1ec30a25c1db288161d0fa8893d985fa20bcdb07 net: remove use of ndo_set_multicast_list in drivers replace it by ndo_set_rx_mode Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller --- diff --git a/jme.c b/jme.c index 7dae9b8..2695a8e 100644 --- a/jme.c +++ b/jme.c @@ -3112,7 +3112,11 @@ static const struct net_device_ops jme_netdev_ops = { .ndo_do_ioctl = jme_ioctl, .ndo_start_xmit = jme_start_xmit, .ndo_set_mac_address = jme_set_macaddr, +#ifndef __USE_NDO_SET_RX_MODE__ .ndo_set_multicast_list = jme_set_multi, +#else + .ndo_set_rx_mode = jme_set_multi, +#endif .ndo_change_mtu = jme_change_mtu, .ndo_tx_timeout = jme_tx_timeout, #ifndef __UNIFY_VLAN_RX_PATH__ diff --git a/jme.h b/jme.h index a240240..126f6fa 100644 --- a/jme.h +++ b/jme.h @@ -118,6 +118,7 @@ do { \ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) #define __UNIFY_VLAN_RX_PATH__ +#define __USE_NDO_SET_RX_MODE__ #endif /*