AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 22:16:43 +07:00
Code Issues Actions Packages Projects 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:16 +08:00 committed by David S. Miller
parent 35d75ee43f
commit dda0fd5c83
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/bonding/bond_alb.c
View File

@ -1343,9 +1343,8 @@ void bond_alb_deinitialize(struct bonding *bond)
tlb_deinitialize(bond); tlb_deinitialize(bond);
if (bond_info->rlb_enabled) { if (bond_info->rlb_enabled)
rlb_deinitialize(bond); rlb_deinitialize(bond);
}
} }
int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
@ -1429,9 +1428,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
break; break;
case ETH_P_ARP: case ETH_P_ARP:
do_tx_balance = 0; do_tx_balance = 0;
if (bond_info->rlb_enabled) { if (bond_info->rlb_enabled)
tx_slave = rlb_arp_xmit(skb, bond); tx_slave = rlb_arp_xmit(skb, bond);
}
break; break;
default: default:
do_tx_balance = 0; do_tx_balance = 0;
@ -1565,11 +1563,10 @@ void bond_alb_monitor(struct work_struct *work)
--bond_info->rlb_update_delay_counter; --bond_info->rlb_update_delay_counter;
} else { } else {
rlb_update_rx_clients(bond); rlb_update_rx_clients(bond);
if (bond_info->rlb_update_retry_counter) { if (bond_info->rlb_update_retry_counter)
--bond_info->rlb_update_retry_counter; --bond_info->rlb_update_retry_counter;
} else { else
bond_info->rx_ntt = 0; bond_info->rx_ntt = 0;
}
} }
} }
} }
@ -1586,23 +1583,20 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
int res; int res;
res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr); res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);
if (res) { if (res)
return res; return res;
}
res = alb_handle_addr_collision_on_attach(bond, slave); res = alb_handle_addr_collision_on_attach(bond, slave);
if (res) { if (res)
return res; return res;
}
tlb_init_slave(slave); tlb_init_slave(slave);
/* order a rebalance ASAP */ /* order a rebalance ASAP */
bond->alb_info.tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS; bond->alb_info.tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;
if (bond->alb_info.rlb_enabled) { if (bond->alb_info.rlb_enabled)
bond->alb_info.rlb_rebalance = 1; bond->alb_info.rlb_rebalance = 1;
}
return 0; return 0;
} }