[net-next,1/2] bonding: slight optimization for bond_xmit_roundrobin()

Message ID 541C29F9.6020001@huawei.com
State New
Headers show

Commit Message

Ding Tianhong Sept. 19, 2014, 1:04 p.m.
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>
---
 drivers/net/bonding/bond_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Sept. 22, 2014, 7:21 p.m. | #1
From: Ding Tianhong <dingtianhong@huawei.com>
Date: Fri, 19 Sep 2014 21:04:57 +0800

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b43b2df..0324603 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3624,7 +3624,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);