From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Horman Subject: [PATCH] bonding: reset queue mapping prior to transmission to physical device Date: Thu, 2 Jun 2011 14:03:19 -0400 Message-ID: <1307037799-32315-1-git-send-email-nhorman@tuxdriver.com> Cc: Neil Horman , Jay Vosburgh , Andy Gospodarek , "David S. Miller" To: netdev@vger.kernel.org Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:34663 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640Ab1FBSDn (ORCPT ); Thu, 2 Jun 2011 14:03:43 -0400 Sender: netdev-owner@vger.kernel.org List-ID: The bonding driver is multiqueue enabled, in which each queue represents a slave to enable optional steering of output frames to given slaves against the default output policy. However, it needs to reset the skb->queue_mapping prior to queuing to the physical device or the physical slave (if it is multiqueue) could wind up transmitting on an unintended tx queue (one that was reserved for specific traffic classes for instance) Signed-off-by: Neil Horman CC: Jay Vosburgh CC: Andy Gospodarek CC: "David S. Miller" --- drivers/net/bonding/bond_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 17b4dd9..812c70c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4200,6 +4200,11 @@ static inline int bond_slave_override(struct bonding *bond, /* If the slave isn't UP, use default transmit policy. */ if (slave && slave->queue_id && IS_UP(slave->dev) && (slave->link == BOND_LINK_UP)) { + /* + * Reset the queue mapping to allow the underlying slave + * the chance to re-select an appropriate tx queue + */ + skb_set_queue_mapping(skb, 0); res = bond_dev_queue_xmit(bond, skb, slave->dev); } -- 1.7.3.4