From: Joe Jin Date: Fri, 18 May 2012 02:10:06 +0000 (+0800) Subject: net: remove use of ndo_set_multicast_list in realtek drivers X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~54 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=27f611b9549852e67e956732bcfa09ac57748a26;p=users%2Fjedix%2Flinux-maple.git net: remove use of ndo_set_multicast_list in realtek drivers replace it by ndo_set_rx_mode for realtek devices (backported from commit afc4b13df143122f99a0eb10bfefb216c2806de0) Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Joe Jin --- diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index eb8631292b8b..f26bce58ad6f 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -1808,7 +1808,7 @@ static const struct net_device_ops cp_netdev_ops = { .ndo_stop = cp_close, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = cp_set_mac_address, - .ndo_set_multicast_list = cp_set_rx_mode, + .ndo_set_rx_mode = cp_set_rx_mode, .ndo_get_stats = cp_get_stats, .ndo_do_ioctl = cp_ioctl, .ndo_start_xmit = cp_start_xmit, diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index e3bad8247fd1..1bf6844d2e25 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -915,7 +915,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = rtl8139_set_mac_address, .ndo_start_xmit = rtl8139_start_xmit, - .ndo_set_multicast_list = rtl8139_set_rx_mode, + .ndo_set_rx_mode = rtl8139_set_rx_mode, .ndo_do_ioctl = netdev_ioctl, .ndo_tx_timeout = rtl8139_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER diff --git a/drivers/net/atp.c b/drivers/net/atp.c index f3459798b0e9..e3f57fdbf0ea 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c @@ -245,7 +245,7 @@ static const struct net_device_ops atp_netdev_ops = { .ndo_open = net_open, .ndo_stop = net_close, .ndo_start_xmit = atp_send_packet, - .ndo_set_multicast_list = set_rx_mode, + .ndo_set_rx_mode = set_rx_mode, .ndo_tx_timeout = tx_timeout, .ndo_change_mtu = eth_change_mtu, .ndo_set_mac_address = eth_mac_addr, diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index bc68428b1058..fe776612a3bf 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3182,7 +3182,7 @@ static const struct net_device_ops rtl8169_netdev_ops = { .ndo_set_features = rtl8169_set_features, .ndo_set_mac_address = rtl_set_mac_address, .ndo_do_ioctl = rtl8169_ioctl, - .ndo_set_multicast_list = rtl_set_rx_mode, + .ndo_set_rx_mode = rtl_set_rx_mode, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = rtl8169_netpoll, #endif diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c index fa74314ef789..d65205207ecf 100644 --- a/drivers/net/sc92031.c +++ b/drivers/net/sc92031.c @@ -1389,7 +1389,7 @@ static const struct net_device_ops sc92031_netdev_ops = { .ndo_start_xmit = sc92031_start_xmit, .ndo_open = sc92031_open, .ndo_stop = sc92031_stop, - .ndo_set_multicast_list = sc92031_set_multicast_list, + .ndo_set_rx_mode = sc92031_set_multicast_list, .ndo_change_mtu = eth_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,