Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09dca476 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

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.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7f9643fd

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −1
Original line number Diff line number Diff line
@@ -6762,7 +6762,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;