aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic
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/qlogic
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/qlogic')
-rw-r--r--drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qla3xxx.c1
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_main.c2
4 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 8c7fc32d781f..de18e4753b64 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -524,7 +524,7 @@ static const struct net_device_ops netxen_netdev_ops = {
524 .ndo_start_xmit = netxen_nic_xmit_frame, 524 .ndo_start_xmit = netxen_nic_xmit_frame,
525 .ndo_get_stats64 = netxen_nic_get_stats, 525 .ndo_get_stats64 = netxen_nic_get_stats,
526 .ndo_validate_addr = eth_validate_addr, 526 .ndo_validate_addr = eth_validate_addr,
527 .ndo_set_multicast_list = netxen_set_multicast_list, 527 .ndo_set_rx_mode = netxen_set_multicast_list,
528 .ndo_set_mac_address = netxen_nic_set_mac, 528 .ndo_set_mac_address = netxen_nic_set_mac,
529 .ndo_change_mtu = netxen_nic_change_mtu, 529 .ndo_change_mtu = netxen_nic_change_mtu,
530 .ndo_tx_timeout = netxen_tx_timeout, 530 .ndo_tx_timeout = netxen_tx_timeout,
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index ccde8061afa8..8cab61c08c8d 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3762,7 +3762,6 @@ static const struct net_device_ops ql3xxx_netdev_ops = {
3762 .ndo_open = ql3xxx_open, 3762 .ndo_open = ql3xxx_open,
3763 .ndo_start_xmit = ql3xxx_send, 3763 .ndo_start_xmit = ql3xxx_send,
3764 .ndo_stop = ql3xxx_close, 3764 .ndo_stop = ql3xxx_close,
3765 .ndo_set_multicast_list = NULL, /* not allowed on NIC side */
3766 .ndo_change_mtu = eth_change_mtu, 3765 .ndo_change_mtu = eth_change_mtu,
3767 .ndo_validate_addr = eth_validate_addr, 3766 .ndo_validate_addr = eth_validate_addr,
3768 .ndo_set_mac_address = ql3xxx_set_mac_address, 3767 .ndo_set_mac_address = ql3xxx_set_mac_address,
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index ec8ef72d38d3..b447cc50693a 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -325,7 +325,7 @@ static const struct net_device_ops qlcnic_netdev_ops = {
325 .ndo_start_xmit = qlcnic_xmit_frame, 325 .ndo_start_xmit = qlcnic_xmit_frame,
326 .ndo_get_stats = qlcnic_get_stats, 326 .ndo_get_stats = qlcnic_get_stats,
327 .ndo_validate_addr = eth_validate_addr, 327 .ndo_validate_addr = eth_validate_addr,
328 .ndo_set_multicast_list = qlcnic_set_multi, 328 .ndo_set_rx_mode = qlcnic_set_multi,
329 .ndo_set_mac_address = qlcnic_set_mac, 329 .ndo_set_mac_address = qlcnic_set_mac,
330 .ndo_change_mtu = qlcnic_change_mtu, 330 .ndo_change_mtu = qlcnic_change_mtu,
331 .ndo_fix_features = qlcnic_fix_features, 331 .ndo_fix_features = qlcnic_fix_features,
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index f07e96ec8843..39360c485867 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4676,7 +4676,7 @@ static const struct net_device_ops qlge_netdev_ops = {
4676 .ndo_start_xmit = qlge_send, 4676 .ndo_start_xmit = qlge_send,
4677 .ndo_change_mtu = qlge_change_mtu, 4677 .ndo_change_mtu = qlge_change_mtu,
4678 .ndo_get_stats = qlge_get_stats, 4678 .ndo_get_stats = qlge_get_stats,
4679 .ndo_set_multicast_list = qlge_set_multicast_list, 4679 .ndo_set_rx_mode = qlge_set_multicast_list,
4680 .ndo_set_mac_address = qlge_set_mac_address, 4680 .ndo_set_mac_address = qlge_set_mac_address,
4681 .ndo_validate_addr = eth_validate_addr, 4681 .ndo_validate_addr = eth_validate_addr,
4682 .ndo_tx_timeout = qlge_tx_timeout, 4682 .ndo_tx_timeout = qlge_tx_timeout,