From: Alexander Duyck Date: Wed, 20 Jul 2011 00:09:10 +0000 (+0000) Subject: ixgbe: Always tag VLAN tagged packets X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~209 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a834b4fe73132251859a09ecb564645d3dfb006e;p=users%2Fjedix%2Flinux-maple.git ixgbe: Always tag VLAN tagged packets This change is meant to fix the patch: ixgbe: Cleanup FCOE and VLAN handling in xmit_frame_ring And can be rolled into it if needed. What this fixes is that VLAN tagged packets were not being tagged if they were prio 7 which matches up with TC_PRIO_CONTROL. In order to fix it I am just setting things up so that we always tag VLAN tagged packets. (cherry picked from commit 09dca476e3201baac2dcbddc857b83aa25cbdf2e) Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Tested-by: Phil Schmitt Signed-off-by: Joe Jin --- diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 9897a6548d02..5f4b77ede106 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -6760,7 +6760,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, } if ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) && - skb->priority != TC_PRIO_CONTROL) { + ((tx_flags & (IXGBE_TX_FLAGS_HW_VLAN | IXGBE_TX_FLAGS_SW_VLAN)) || + (skb->priority != TC_PRIO_CONTROL))) { tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK; tx_flags |= tx_ring->dcb_tc << IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT;