aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authordingtianhong <dingtianhong@huawei.com>2014-09-19 21:04:57 +0800
committerDavid S. Miller <davem@davemloft.net>2014-09-22 15:21:00 -0400
commita64d044e3907b717ae3d1e3711226064b42c83f4 (patch)
treee54eef6b19aae22b81635bc0439520cbe163604e /drivers
parentudp: Need to make ip6_udp_tunnel.c have GPL license (diff)
downloadlinux-dev-a64d044e3907b717ae3d1e3711226064b42c83f4.tar.xz
linux-dev-a64d044e3907b717ae3d1e3711226064b42c83f4.zip
bonding: slight optimization for bond_xmit_roundrobin()
When the slave is the curr_active_slave, no need to check whether the slave is active or not, it is always active. Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 5e7987bba583..88b1ab04ce4b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3526,7 +3526,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
*/
if (iph->protocol == IPPROTO_IGMP && skb->protocol == htons(ETH_P_IP)) {
slave = rcu_dereference(bond->curr_active_slave);
- if (slave && bond_slave_can_tx(slave))
+ if (slave)
bond_dev_queue_xmit(bond, skb, slave->dev);
else
bond_xmit_slave_id(bond, skb, 0);