From 9bdb6db0595f44a9a47437b1284a2bfbd56d5e0b Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Sat, 11 Jun 2011 01:44:53 +0000 Subject: [PATCH] --- yaml --- r: 256615 b: refs/heads/master c: 6440752c872e418452a2cbbf5e73d546affe2b28 h: refs/heads/master i: 256613: 8e89ee5dc0d05499002022fa5dddb4e1396797e4 256611: 25270a0de159b67e79128655d149017a79539133 256607: 9a254c668262db6283a59a0deb00d50118e81932 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ebc79a558d09..34c5729f7425 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a14bc2bb7075e59be635a2470dc0a32c5a0e8e21 +refs/heads/master: 6440752c872e418452a2cbbf5e73d546affe2b28 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index de307965dfee..f05ddf31a19f 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -6795,11 +6795,10 @@ static int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size) static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) { struct ixgbe_adapter *adapter = netdev_priv(dev); - int txq = smp_processor_id(); + int txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : + smp_processor_id(); #ifdef IXGBE_FCOE - __be16 protocol; - - protocol = vlan_get_protocol(skb); + __be16 protocol = vlan_get_protocol(skb); if (((protocol == htons(ETH_P_FCOE)) || (protocol == htons(ETH_P_FIP))) &&