bonding: slight optimization for bond_alb_xmit()
authordingtianhong <dingtianhong@huawei.com>
Thu, 2 Jan 2014 01:13:02 +0000 (09:13 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Jan 2014 03:58:15 +0000 (22:58 -0500)
The bond_alb_xmit will check the return value for
bond_dev_queue_xmit() every time, but the bond_dev_queue_xmit()
is always return 0, it is no need to check the value every time,
so remove the unneed judgement for the xmit path.

Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_alb.c

index 759ddeebe39028e1d4b5e4adcf7c322b64cdfd52..a2c47476804dc388406e05b4c425c4be59089add 100644 (file)
@@ -1371,7 +1371,6 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
        int do_tx_balance = 1;
        u32 hash_index = 0;
        const u8 *hash_start = NULL;
-       int res = 1;
        struct ipv6hdr *ip6hdr;
 
        skb_reset_mac_header(skb);
@@ -1469,7 +1468,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                               ETH_ALEN);
                }
 
-               res = bond_dev_queue_xmit(bond, skb, tx_slave->dev);
+               bond_dev_queue_xmit(bond, skb, tx_slave->dev);
+               goto out;
        } else {
                if (tx_slave) {
                        _lock_tx_hashtbl(bond);
@@ -1478,11 +1478,9 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
                }
        }
 
-       if (res) {
-               /* no suitable interface, frame not sent */
-               kfree_skb(skb);
-       }
-
+       /* no suitable interface, frame not sent */
+       kfree_skb(skb);
+out:
        return NETDEV_TX_OK;
 }