aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2009-05-11 19:37:15 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-17 14:59:47 -0400
commit3a6d54c56326c29c5357655779cfe6cf36481b17 (patch)
tree1c2f47eecebe98b8501d884cf482a8b777171cd7 /drivers/net/bonding
parent8b3521eeb7598c3b10c7e14361a7974464527702 (diff)
net: remove needless (now buggy) & from dev->dev_addr
Patch fixes issues with dev->dev_addr changing from array to pointer. Hopefully there are no others. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_3ad.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 8c2e5ab51f08..06009dc50b19 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1845,9 +1845,10 @@ static u16 aggregator_identifier;
1845 * Can be called only after the mac address of the bond is set. 1845 * Can be called only after the mac address of the bond is set.
1846 */ 1846 */
1847void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution, int lacp_fast) 1847void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution, int lacp_fast)
1848{ 1848{
1849 // check that the bond is not initialized yet 1849 // check that the bond is not initialized yet
1850 if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr), &(bond->dev->dev_addr))) { 1850 if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr),
1851 bond->dev->dev_addr)) {
1851 1852
1852 aggregator_identifier = 0; 1853 aggregator_identifier = 0;
1853 1854