diff options
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index d587967a6547..f095a3b479d7 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
| @@ -6762,7 +6762,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, | |||
| 6762 | } | 6762 | } |
| 6763 | 6763 | ||
| 6764 | if ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) && | 6764 | if ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) && |
| 6765 | skb->priority != TC_PRIO_CONTROL) { | 6765 | ((tx_flags & (IXGBE_TX_FLAGS_HW_VLAN | IXGBE_TX_FLAGS_SW_VLAN)) || |
| 6766 | (skb->priority != TC_PRIO_CONTROL))) { | ||
| 6766 | tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK; | 6767 | tx_flags &= ~IXGBE_TX_FLAGS_VLAN_PRIO_MASK; |
| 6767 | tx_flags |= tx_ring->dcb_tc << | 6768 | tx_flags |= tx_ring->dcb_tc << |
| 6768 | IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT; | 6769 | IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT; |
