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

Commit a149f2c3 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: Only offload VLAN tag if enabled 



The driver was offloading the VLAN tag into the skb
any time there was a VLAN tag and the hardware stripping was
enabled.  Just check to make sure it's enabled before put_tag.

Change-Id: Ife95290c06edd9a616393b38679923938b382241
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent db077278

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+2 −1
Original line number Diff line number Diff line
@@ -1370,7 +1370,8 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring, 
{

	struct i40e_q_vector *q_vector = rx_ring->q_vector;



	if (vlan_tag & VLAN_VID_MASK)

	if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    (vlan_tag & VLAN_VID_MASK))

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);



	napi_gro_receive(&q_vector->napi, skb);

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+2 −1
Original line number Diff line number Diff line
@@ -842,7 +842,8 @@ static void i40e_receive_skb(struct i40e_ring *rx_ring, 
{

	struct i40e_q_vector *q_vector = rx_ring->q_vector;



	if (vlan_tag & VLAN_VID_MASK)

	if ((rx_ring->netdev->features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    (vlan_tag & VLAN_VID_MASK))

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);



	napi_gro_receive(&q_vector->napi, skb);