bonding: trivial: remove unused parameter from alb_swap_mac_addr()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Veaceslav Falico and committed by

David S. Miller 13 years ago 43547ea6 7332a13b

+4 -4

1 changed file

expand all

drivers

net

bonding

bond_alb.c

+4 -4

drivers/net/bonding/bond_alb.c

··· 1056 1056 * 1057 1057 */ 1058 1058 1059 - static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct slave *slave2) 1059 + static void alb_swap_mac_addr(struct slave *slave1, struct slave *slave2) 1060 1060 { 1061 1061 u8 tmp_mac_addr[ETH_ALEN]; 1062 1062 ··· 1149 1149 1150 1150 if (found) { 1151 1151 /* locking: needs RTNL and nothing else */ 1152 - alb_swap_mac_addr(bond, slave, tmp_slave); 1152 + alb_swap_mac_addr(slave, tmp_slave); 1153 1153 alb_fasten_mac_swap(bond, slave, tmp_slave); 1154 1154 } 1155 1155 } ··· 1750 1750 /* curr_active_slave must be set before calling alb_swap_mac_addr */ 1751 1751 if (swap_slave) { 1752 1752 /* swap mac address */ 1753 - alb_swap_mac_addr(bond, swap_slave, new_slave); 1753 + alb_swap_mac_addr(swap_slave, new_slave); 1754 1754 } else { 1755 1755 /* set the new_slave to the bond mac address */ 1756 1756 alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr); ··· 1810 1810 } 1811 1811 1812 1812 if (swap_slave) { 1813 - alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave); 1813 + alb_swap_mac_addr(swap_slave, bond->curr_active_slave); 1814 1814 alb_fasten_mac_swap(bond, swap_slave, bond->curr_active_slave); 1815 1815 } else { 1816 1816 alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr);