|
@@ -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))) &&
|