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 b1cf46a0c48c..5e5fe2fd6397 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -538,7 +538,7 @@ netxen_nic_set_mcast_addr(struct netxen_adapter *adapter, | |||
538 | void netxen_p2_nic_set_multi(struct net_device *netdev) | 538 | void netxen_p2_nic_set_multi(struct net_device *netdev) |
539 | { | 539 | { |
540 | struct netxen_adapter *adapter = netdev_priv(netdev); | 540 | struct netxen_adapter *adapter = netdev_priv(netdev); |
541 | struct dev_mc_list *mc_ptr; | 541 | struct netdev_hw_addr *ha; |
542 | u8 null_addr[6]; | 542 | u8 null_addr[6]; |
543 | int i; | 543 | int i; |
544 | 544 | ||
@@ -572,8 +572,8 @@ void netxen_p2_nic_set_multi(struct net_device *netdev) | |||
572 | netxen_nic_enable_mcast_filter(adapter); | 572 | netxen_nic_enable_mcast_filter(adapter); |
573 | 573 | ||
574 | i = 0; | 574 | i = 0; |
575 | netdev_for_each_mc_addr(mc_ptr, netdev) | 575 | netdev_for_each_mc_addr(ha, netdev) |
576 | netxen_nic_set_mcast_addr(adapter, i++, mc_ptr->dmi_addr); | 576 | netxen_nic_set_mcast_addr(adapter, i++, ha->addr); |
577 | 577 | ||
578 | /* Clear out remaining addresses */ | 578 | /* Clear out remaining addresses */ |
579 | while (i < adapter->max_mc_count) | 579 | while (i < adapter->max_mc_count) |
@@ -681,7 +681,7 @@ static int nx_p3_nic_add_mac(struct netxen_adapter *adapter, | |||
681 | void netxen_p3_nic_set_multi(struct net_device *netdev) | 681 | void netxen_p3_nic_set_multi(struct net_device *netdev) |
682 | { | 682 | { |
683 | struct netxen_adapter *adapter = netdev_priv(netdev); | 683 | struct netxen_adapter *adapter = netdev_priv(netdev); |
684 | struct dev_mc_list *mc_ptr; | 684 | struct netdev_hw_addr *ha; |
685 | u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | 685 | u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
686 | u32 mode = VPORT_MISS_MODE_DROP; | 686 | u32 mode = VPORT_MISS_MODE_DROP; |
687 | LIST_HEAD(del_list); | 687 | LIST_HEAD(del_list); |
@@ -708,8 +708,8 @@ void netxen_p3_nic_set_multi(struct net_device *netdev) | |||
708 | } | 708 | } |
709 | 709 | ||
710 | if (!netdev_mc_empty(netdev)) { | 710 | if (!netdev_mc_empty(netdev)) { |
711 | netdev_for_each_mc_addr(mc_ptr, netdev) | 711 | netdev_for_each_mc_addr(ha, netdev) |
712 | nx_p3_nic_add_mac(adapter, mc_ptr->dmi_addr, &del_list); | 712 | nx_p3_nic_add_mac(adapter, ha->addr, &del_list); |
713 | } | 713 | } |
714 | 714 | ||
715 | send_fw_cmd: | 715 | send_fw_cmd: |