bonding: trivial: remove unused parameter from alb_swap_mac_addr()
authorVeaceslav Falico <vfalico@redhat.com>
Mon, 27 May 2013 23:14:51 +0000 (23:14 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 May 2013 06:57:23 +0000 (23:57 -0700)
After b924551 ("bonding: fix enslaving in alb mode when link down") we
don't need the bond parameter in alb_swap_mac_addr(), so remove it.

Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_alb.c

index e02cc265723abbaf397abbf84b0751d817dc5efd..a236234d2c2702894e41974d90d7d2351e023ff4 100644 (file)
@@ -1056,7 +1056,7 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[])
  *
  */
 
-static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct slave *slave2)
+static void alb_swap_mac_addr(struct slave *slave1, struct slave *slave2)
 {
        u8 tmp_mac_addr[ETH_ALEN];
 
@@ -1149,7 +1149,7 @@ static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *sla
 
                if (found) {
                        /* locking: needs RTNL and nothing else */
-                       alb_swap_mac_addr(bond, slave, tmp_slave);
+                       alb_swap_mac_addr(slave, tmp_slave);
                        alb_fasten_mac_swap(bond, slave, tmp_slave);
                }
        }
@@ -1750,7 +1750,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
        /* curr_active_slave must be set before calling alb_swap_mac_addr */
        if (swap_slave) {
                /* swap mac address */
-               alb_swap_mac_addr(bond, swap_slave, new_slave);
+               alb_swap_mac_addr(swap_slave, new_slave);
        } else {
                /* set the new_slave to the bond mac address */
                alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr);
@@ -1810,7 +1810,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
        }
 
        if (swap_slave) {
-               alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);
+               alb_swap_mac_addr(swap_slave, bond->curr_active_slave);
                alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave);
        } else {
                alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr);