diff options
author | Narender Kumar <narender.kumar@qlogic.com> | 2009-11-20 17:08:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-21 14:37:37 -0500 |
commit | 5d09e534bbb94e1fdc8e4783ac822bc172465a91 (patch) | |
tree | c7096c8b0d87dbad2d05d8d0d4362c52b681e6c0 /drivers/net/netxen/netxen_nic_hw.c | |
parent | a7483b0afa63e851c4438ddda8934a296851f1de (diff) |
netxen : fix BOND_MODE_TLB/ALB mode.
o Along with netdev->perm_addr, mac address will be
maintained in device private structure.
o Device limitation: We need to set mac address when ever
interface comes up.
In ALB/TAL mode, bonding driver calls set_mac for all slave with bond mac address.
But bonding driver set netdev->dev_addr field to its original value,
after enslaving interfaces.
When ever active slave changes, it swap dev_addr of inactive slave with active.
Yet it doesn't notify driver about change in netdev->dev_addr.
As netxen driver need to set mac addr when ever interface comes up,
it can't rely on netdev->dev_addr field. Specially in case of bonding mode ALB/TLB.
Signed-off-by: Narender Kumar <narender.kumar@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index e2c4a0192ea1..52a3798d8d94 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -463,7 +463,7 @@ netxen_nic_enable_mcast_filter(struct netxen_adapter *adapter) | |||
463 | { | 463 | { |
464 | u32 val = 0; | 464 | u32 val = 0; |
465 | u16 port = adapter->physical_port; | 465 | u16 port = adapter->physical_port; |
466 | u8 *addr = adapter->netdev->dev_addr; | 466 | u8 *addr = adapter->mac_addr; |
467 | 467 | ||
468 | if (adapter->mc_enabled) | 468 | if (adapter->mc_enabled) |
469 | return 0; | 469 | return 0; |
@@ -492,7 +492,7 @@ netxen_nic_disable_mcast_filter(struct netxen_adapter *adapter) | |||
492 | { | 492 | { |
493 | u32 val = 0; | 493 | u32 val = 0; |
494 | u16 port = adapter->physical_port; | 494 | u16 port = adapter->physical_port; |
495 | u8 *addr = adapter->netdev->dev_addr; | 495 | u8 *addr = adapter->mac_addr; |
496 | 496 | ||
497 | if (!adapter->mc_enabled) | 497 | if (!adapter->mc_enabled) |
498 | return 0; | 498 | return 0; |
@@ -687,7 +687,7 @@ void netxen_p3_nic_set_multi(struct net_device *netdev) | |||
687 | 687 | ||
688 | list_splice_tail_init(&adapter->mac_list, &del_list); | 688 | list_splice_tail_init(&adapter->mac_list, &del_list); |
689 | 689 | ||
690 | nx_p3_nic_add_mac(adapter, netdev->dev_addr, &del_list); | 690 | nx_p3_nic_add_mac(adapter, adapter->mac_addr, &del_list); |
691 | nx_p3_nic_add_mac(adapter, bcast_addr, &del_list); | 691 | nx_p3_nic_add_mac(adapter, bcast_addr, &del_list); |
692 | 692 | ||
693 | if (netdev->flags & IFF_PROMISC) { | 693 | if (netdev->flags & IFF_PROMISC) { |