mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

bonding:fix checkpatch warnings braces {}

Browse source 
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wang Yufen 2014-02-14 17:15:17 +08:00 committed by David S. Miller
parent dda0fd5c83
commit 73ac0cd48f
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/bonding/bond_alb.c
View file

@ -1627,9 +1627,8 @@ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char
if (link == BOND_LINK_DOWN) {
tlb_clear_slave(bond, slave, 0);
if (bond->alb_info.rlb_enabled) {
if (bond->alb_info.rlb_enabled)
rlb_clear_slave(bond, slave);
}
} else if (link == BOND_LINK_UP) {
/* order a rebalance ASAP */
bond_info->tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;
@ -1741,14 +1740,12 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
struct slave *swap_slave;
int res;
if (!is_valid_ether_addr(sa->sa_data)) {
if (!is_valid_ether_addr(sa->sa_data))
return -EADDRNOTAVAIL;
}
res = alb_set_mac_address(bond, addr);
if (res) {
if (res)
return res;
}
memcpy(bond_dev->dev_addr, sa->sa_data, bond_dev->addr_len);
@ -1756,9 +1753,8 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
* Otherwise we'll need to pass the new address to it and handle
* duplications.
*/
if (!bond->curr_active_slave) {
if (!bond->curr_active_slave)
return 0;
}
swap_slave = bond_slave_has_mac(bond, bond_dev->dev_addr);
@ -1782,8 +1778,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
void bond_alb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
{
if (bond->alb_info.rlb_enabled) {
if (bond->alb_info.rlb_enabled)
rlb_clear_vlan(bond, vlan_id);
}
}