diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index a945591298a8..781ca893ee0a 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -537,7 +537,7 @@ netxen_nic_set_mcast_addr(struct netxen_adapter *adapter, | |||
537 | void netxen_p2_nic_set_multi(struct net_device *netdev) | 537 | void netxen_p2_nic_set_multi(struct net_device *netdev) |
538 | { | 538 | { |
539 | struct netxen_adapter *adapter = netdev_priv(netdev); | 539 | struct netxen_adapter *adapter = netdev_priv(netdev); |
540 | struct dev_mc_list *mc_ptr; | 540 | struct netdev_hw_addr *ha; |
541 | u8 null_addr[6]; | 541 | u8 null_addr[6]; |
542 | int i; | 542 | int i; |
543 | 543 | ||
@@ -571,8 +571,8 @@ void netxen_p2_nic_set_multi(struct net_device *netdev) | |||
571 | netxen_nic_enable_mcast_filter(adapter); | 571 | netxen_nic_enable_mcast_filter(adapter); |
572 | 572 | ||
573 | i = 0; | 573 | i = 0; |
574 | netdev_for_each_mc_addr(mc_ptr, netdev) | 574 | netdev_for_each_mc_addr(ha, netdev) |
575 | netxen_nic_set_mcast_addr(adapter, i++, mc_ptr->dmi_addr); | 575 | netxen_nic_set_mcast_addr(adapter, i++, ha->addr); |
576 | 576 | ||
577 | /* Clear out remaining addresses */ | 577 | /* Clear out remaining addresses */ |
578 | while (i < adapter->max_mc_count) | 578 | while (i < adapter->max_mc_count) |
@@ -680,7 +680,7 @@ static int nx_p3_nic_add_mac(struct netxen_adapter *adapter, | |||
680 | void netxen_p3_nic_set_multi(struct net_device *netdev) | 680 | void netxen_p3_nic_set_multi(struct net_device *netdev) |
681 | { | 681 | { |
682 | struct netxen_adapter *adapter = netdev_priv(netdev); | 682 | struct netxen_adapter *adapter = netdev_priv(netdev); |
683 | struct dev_mc_list *mc_ptr; | 683 | struct netdev_hw_addr *ha; |
684 | u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | 684 | u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
685 | u32 mode = VPORT_MISS_MODE_DROP; | 685 | u32 mode = VPORT_MISS_MODE_DROP; |
686 | LIST_HEAD(del_list); | 686 | LIST_HEAD(del_list); |
@@ -707,8 +707,8 @@ void netxen_p3_nic_set_multi(struct net_device *netdev) | |||
707 | } | 707 | } |
708 | 708 | ||
709 | if (!netdev_mc_empty(netdev)) { | 709 | if (!netdev_mc_empty(netdev)) { |
710 | netdev_for_each_mc_addr(mc_ptr, netdev) | 710 | netdev_for_each_mc_addr(ha, netdev) |
711 | nx_p3_nic_add_mac(adapter, mc_ptr->dmi_addr, &del_list); | 711 | nx_p3_nic_add_mac(adapter, ha->addr, &del_list); |
712 | } | 712 | } |
713 | 713 | ||
714 | send_fw_cmd: | 714 | send_fw_cmd: |