From 1d302de125418f183dccae59113dbde01b259674 Mon Sep 17 00:00:00 2001 From: Lucy Liu Date: Wed, 5 Aug 2009 13:06:34 -0700 Subject: [PATCH] --- yaml --- r: 159325 b: refs/heads/master c: 36e89d73e54c8db79d0fd1636cab9236eea7aae9 h: refs/heads/master i: 159323: f6bb7c206d911cf2317464ce0efbb9b3de89b673 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2f4b825e371b..9fd630ef53af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14074eab8dcaa7f66d8f52612b2dcec51222bb5f +refs/heads/master: 36e89d73e54c8db79d0fd1636cab9236eea7aae9 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 44adc9862826..52d7f19de435 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -5126,7 +5126,7 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb) return smp_processor_id(); if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) - return 0; /* All traffic should default to class 0 */ + return (skb->vlan_tci & IXGBE_TX_FLAGS_VLAN_PRIO_MASK) >> 13; return skb_tx_hash(dev, skb); }