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

Commit 5d9a533b authored by Pascal Bouchareine's avatar Pascal Bouchareine Committed by Jeff Kirsher
Browse files

ixgbevf: fix VF untagging when 802.1 prio is set 



We have had an issue when using ixgbe+ixgbevf and 802.1 VLAN tagging.

When attaching a VLAN to a VF, frames with a 802.1q priority appeared
untagged on the VF hence not reaching the VLAN, where frames with
priority 0 where tagged as expected and seen by the VLAN device.

This seems due to the way ixgbevf is looking up the full tag
(prio+cfi+vlan) against the adapter active_vlans, as a condition to mark
the skb tagged.

Signed-off-by: default avatarPascal Bouchareine <pascal@gandi.net>
Tested-by: default avatarSibai Li <sibai.li@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ddbe5032

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, 
	bool is_vlan = (status & IXGBE_RXD_STAT_VP);

	u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan);



	if (is_vlan && test_bit(tag, adapter->active_vlans))

	if (is_vlan && test_bit(tag & VLAN_VID_MASK, adapter->active_vlans))

		__vlan_hwaccel_put_tag(skb, tag);



	napi_gro_receive(&q_vector->napi, skb);