]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
bonding:fix checkpatch warnings braces {}
authorWang Yufen <wangyufen@huawei.com>
Fri, 14 Feb 2014 09:15:16 +0000 (17:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Feb 2014 21:20:22 +0000 (16:20 -0500)
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_alb.c

index cde39f06b34cfada154bf9bf054ae32a8d996161..e7a460096b518e675c5e16c28cf413323fb9216b 100644 (file)
@@ -1343,9 +1343,8 @@ void bond_alb_deinitialize(struct bonding *bond)
 
        tlb_deinitialize(bond);
 
-       if (bond_info->rlb_enabled) {
+       if (bond_info->rlb_enabled)
                rlb_deinitialize(bond);
-       }
 }
 
 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;
        case ETH_P_ARP:
                do_tx_balance = 0;
-               if (bond_info->rlb_enabled) {
+               if (bond_info->rlb_enabled)
                        tx_slave = rlb_arp_xmit(skb, bond);
-               }
                break;
        default:
                do_tx_balance = 0;
@@ -1565,11 +1563,10 @@ void bond_alb_monitor(struct work_struct *work)
                                --bond_info->rlb_update_delay_counter;
                        } else {
                                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;
-                               } else {
+                               else
                                        bond_info->rx_ntt = 0;
-                               }
                        }
                }
        }
@@ -1586,23 +1583,20 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
        int res;
 
        res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);
-       if (res) {
+       if (res)
                return res;
-       }
 
        res = alb_handle_addr_collision_on_attach(bond, slave);
-       if (res) {
+       if (res)
                return res;
-       }
 
        tlb_init_slave(slave);
 
        /* order a rebalance ASAP */
        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;
-       }
 
        return 0;
 }