]> git.karo-electronics.de Git - linux-beck.git/commitdiff
bonding:fix checkpatch warnings braces {}
authorWang Yufen <wangyufen@huawei.com>
Fri, 14 Feb 2014 09:15:17 +0000 (17:15 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Feb 2014 21:20:23 +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 e7a460096b518e675c5e16c28cf413323fb9216b..a212860888218384613d48393fd4475154c16aa0 100644 (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);
-       }
 }