aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWang Yufen <wangyufen@huawei.com>2014-02-14 04:15:15 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-14 16:20:22 -0500
commit35d75ee43f93cdf8ed21ab37636397ecc44d3724 (patch)
tree20fdbf0be4b779605142fb3d62d6e9dd25e21574 /drivers
parentfdb89d75d0fdcca983dc0e8ebfadadb95a370e2a (diff)
bonding:fix checkpatch warnings braces {}
Signed-off-by: Wang Yufen <wangyufen@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_alb.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index a1d4e7a4dc01..cde39f06b34c 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -518,9 +518,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
518{ 518{
519 int i; 519 int i;
520 520
521 if (!client_info->slave) { 521 if (!client_info->slave)
522 return; 522 return;
523 }
524 523
525 for (i = 0; i < RLB_ARP_BURST_SIZE; i++) { 524 for (i = 0; i < RLB_ARP_BURST_SIZE; i++) {
526 struct sk_buff *skb; 525 struct sk_buff *skb;
@@ -568,9 +567,8 @@ static void rlb_update_rx_clients(struct bonding *bond)
568 client_info = &(bond_info->rx_hashtbl[hash_index]); 567 client_info = &(bond_info->rx_hashtbl[hash_index]);
569 if (client_info->ntt) { 568 if (client_info->ntt) {
570 rlb_update_client(client_info); 569 rlb_update_client(client_info);
571 if (bond_info->rlb_update_retry_counter == 0) { 570 if (bond_info->rlb_update_retry_counter == 0)
572 client_info->ntt = 0; 571 client_info->ntt = 0;
573 }
574 } 572 }
575 } 573 }
576 574
@@ -764,9 +762,8 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
764 * rx channel 762 * rx channel
765 */ 763 */
766 tx_slave = rlb_choose_channel(skb, bond); 764 tx_slave = rlb_choose_channel(skb, bond);
767 if (tx_slave) { 765 if (tx_slave)
768 memcpy(arp->mac_src, tx_slave->dev->dev_addr, ETH_ALEN); 766 memcpy(arp->mac_src, tx_slave->dev->dev_addr, ETH_ALEN);
769 }
770 pr_debug("Server sent ARP Reply packet\n"); 767 pr_debug("Server sent ARP Reply packet\n");
771 } else if (arp->op_code == htons(ARPOP_REQUEST)) { 768 } else if (arp->op_code == htons(ARPOP_REQUEST)) {
772 /* Create an entry in the rx_hashtbl for this client as a 769 /* Create an entry in the rx_hashtbl for this client as a
@@ -818,9 +815,8 @@ static void rlb_rebalance(struct bonding *bond)
818 } 815 }
819 816
820 /* update the team's flag only after the whole iteration */ 817 /* update the team's flag only after the whole iteration */
821 if (ntt) { 818 if (ntt)
822 bond_info->rx_ntt = 1; 819 bond_info->rx_ntt = 1;
823 }
824 _unlock_rx_hashtbl_bh(bond); 820 _unlock_rx_hashtbl_bh(bond);
825} 821}
826 822
@@ -951,9 +947,8 @@ static int rlb_initialize(struct bonding *bond)
951 947
952 bond_info->rx_hashtbl_used_head = RLB_NULL_INDEX; 948 bond_info->rx_hashtbl_used_head = RLB_NULL_INDEX;
953 949
954 for (i = 0; i < RLB_HASH_TABLE_SIZE; i++) { 950 for (i = 0; i < RLB_HASH_TABLE_SIZE; i++)
955 rlb_init_table_entry(bond_info->rx_hashtbl + i); 951 rlb_init_table_entry(bond_info->rx_hashtbl + i);
956 }
957 952
958 _unlock_rx_hashtbl_bh(bond); 953 _unlock_rx_hashtbl_bh(bond);
959 954
@@ -1324,9 +1319,8 @@ int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
1324 int res; 1319 int res;
1325 1320
1326 res = tlb_initialize(bond); 1321 res = tlb_initialize(bond);
1327 if (res) { 1322 if (res)
1328 return res; 1323 return res;
1329 }
1330 1324
1331 if (rlb_enabled) { 1325 if (rlb_enabled) {
1332 bond->alb_info.rlb_enabled = 1; 1326 bond->alb_info.rlb_enabled = 1;