aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-08-16 02:29:01 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-17 23:22:03 -0400
commitafc4b13df143122f99a0eb10bfefb216c2806de0 (patch)
tree5a90e0a8226ce4173d8d366f5bed0322c9623cdd /drivers/net/ethernet/intel
parent01789349ee52e4a3faf376f1485303d9723c4f1f (diff)
net: remove use of ndo_set_multicast_list in drivers
replace it by ndo_set_rx_mode Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/e100.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c2
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c1
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c2
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c2
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c1
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c1
7 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index c1352c60c299..fe87d3eea5ed 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2738,7 +2738,7 @@ static const struct net_device_ops e100_netdev_ops = {
2738 .ndo_stop = e100_close, 2738 .ndo_stop = e100_close,
2739 .ndo_start_xmit = e100_xmit_frame, 2739 .ndo_start_xmit = e100_xmit_frame,
2740 .ndo_validate_addr = eth_validate_addr, 2740 .ndo_validate_addr = eth_validate_addr,
2741 .ndo_set_multicast_list = e100_set_multicast_list, 2741 .ndo_set_rx_mode = e100_set_multicast_list,
2742 .ndo_set_mac_address = e100_set_mac_address, 2742 .ndo_set_mac_address = e100_set_mac_address,
2743 .ndo_change_mtu = e100_change_mtu, 2743 .ndo_change_mtu = e100_change_mtu,
2744 .ndo_do_ioctl = e100_do_ioctl, 2744 .ndo_do_ioctl = e100_do_ioctl,
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ab4be80f7ab5..d0fdb512e849 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5761,7 +5761,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
5761 .ndo_stop = e1000_close, 5761 .ndo_stop = e1000_close,
5762 .ndo_start_xmit = e1000_xmit_frame, 5762 .ndo_start_xmit = e1000_xmit_frame,
5763 .ndo_get_stats64 = e1000e_get_stats64, 5763 .ndo_get_stats64 = e1000e_get_stats64,
5764 .ndo_set_multicast_list = e1000_set_multi, 5764 .ndo_set_rx_mode = e1000_set_multi,
5765 .ndo_set_mac_address = e1000_set_mac, 5765 .ndo_set_mac_address = e1000_set_mac,
5766 .ndo_change_mtu = e1000_change_mtu, 5766 .ndo_change_mtu = e1000_change_mtu,
5767 .ndo_do_ioctl = e1000_ioctl, 5767 .ndo_do_ioctl = e1000_ioctl,
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 592b5c1827bc..801608497409 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1790,7 +1790,6 @@ static const struct net_device_ops igb_netdev_ops = {
1790 .ndo_start_xmit = igb_xmit_frame_adv, 1790 .ndo_start_xmit = igb_xmit_frame_adv,
1791 .ndo_get_stats64 = igb_get_stats64, 1791 .ndo_get_stats64 = igb_get_stats64,
1792 .ndo_set_rx_mode = igb_set_rx_mode, 1792 .ndo_set_rx_mode = igb_set_rx_mode,
1793 .ndo_set_multicast_list = igb_set_rx_mode,
1794 .ndo_set_mac_address = igb_set_mac, 1793 .ndo_set_mac_address = igb_set_mac,
1795 .ndo_change_mtu = igb_change_mtu, 1794 .ndo_change_mtu = igb_change_mtu,
1796 .ndo_do_ioctl = igb_ioctl, 1795 .ndo_do_ioctl = igb_ioctl,
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 40ed066e3ef4..a6bdb3c744f0 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2538,7 +2538,7 @@ static const struct net_device_ops igbvf_netdev_ops = {
2538 .ndo_stop = igbvf_close, 2538 .ndo_stop = igbvf_close,
2539 .ndo_start_xmit = igbvf_xmit_frame, 2539 .ndo_start_xmit = igbvf_xmit_frame,
2540 .ndo_get_stats = igbvf_get_stats, 2540 .ndo_get_stats = igbvf_get_stats,
2541 .ndo_set_multicast_list = igbvf_set_multi, 2541 .ndo_set_rx_mode = igbvf_set_multi,
2542 .ndo_set_mac_address = igbvf_set_mac, 2542 .ndo_set_mac_address = igbvf_set_mac,
2543 .ndo_change_mtu = igbvf_change_mtu, 2543 .ndo_change_mtu = igbvf_change_mtu,
2544 .ndo_do_ioctl = igbvf_ioctl, 2544 .ndo_do_ioctl = igbvf_ioctl,
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 6a130eb51cfa..b8ef2c0fc5d0 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -330,7 +330,7 @@ static const struct net_device_ops ixgb_netdev_ops = {
330 .ndo_stop = ixgb_close, 330 .ndo_stop = ixgb_close,
331 .ndo_start_xmit = ixgb_xmit_frame, 331 .ndo_start_xmit = ixgb_xmit_frame,
332 .ndo_get_stats = ixgb_get_stats, 332 .ndo_get_stats = ixgb_get_stats,
333 .ndo_set_multicast_list = ixgb_set_multi, 333 .ndo_set_rx_mode = ixgb_set_multi,
334 .ndo_validate_addr = eth_validate_addr, 334 .ndo_validate_addr = eth_validate_addr,
335 .ndo_set_mac_address = ixgb_set_mac, 335 .ndo_set_mac_address = ixgb_set_mac,
336 .ndo_change_mtu = ixgb_change_mtu, 336 .ndo_change_mtu = ixgb_change_mtu,
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 8c70273b01bc..faa83cea7331 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7205,7 +7205,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
7205 .ndo_start_xmit = ixgbe_xmit_frame, 7205 .ndo_start_xmit = ixgbe_xmit_frame,
7206 .ndo_select_queue = ixgbe_select_queue, 7206 .ndo_select_queue = ixgbe_select_queue,
7207 .ndo_set_rx_mode = ixgbe_set_rx_mode, 7207 .ndo_set_rx_mode = ixgbe_set_rx_mode,
7208 .ndo_set_multicast_list = ixgbe_set_rx_mode,
7209 .ndo_validate_addr = eth_validate_addr, 7208 .ndo_validate_addr = eth_validate_addr,
7210 .ndo_set_mac_address = ixgbe_set_mac, 7209 .ndo_set_mac_address = ixgbe_set_mac,
7211 .ndo_change_mtu = ixgbe_change_mtu, 7210 .ndo_change_mtu = ixgbe_change_mtu,
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 45b007827024..b1e1c2daf5f9 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3221,7 +3221,6 @@ static const struct net_device_ops ixgbe_netdev_ops = {
3221 .ndo_stop = ixgbevf_close, 3221 .ndo_stop = ixgbevf_close,
3222 .ndo_start_xmit = ixgbevf_xmit_frame, 3222 .ndo_start_xmit = ixgbevf_xmit_frame,
3223 .ndo_set_rx_mode = ixgbevf_set_rx_mode, 3223 .ndo_set_rx_mode = ixgbevf_set_rx_mode,
3224 .ndo_set_multicast_list = ixgbevf_set_rx_mode,
3225 .ndo_validate_addr = eth_validate_addr, 3224 .ndo_validate_addr = eth_validate_addr,
3226 .ndo_set_mac_address = ixgbevf_set_mac, 3225 .ndo_set_mac_address = ixgbevf_set_mac,
3227 .ndo_change_mtu = ixgbevf_change_mtu, 3226 .ndo_change_mtu = ixgbevf_change_mtu,