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

Commit dd1ed3b7 authored by Greg Rose's avatar Greg Rose Committed by Jeff Kirsher
Browse files

ixgbevf: Fix broken trunk vlan 



Changes to clean up the vlan rx path broke trunk vlan.  Trunk vlans in
a VF driver are those set using:

"ip link set <pfdev> vf <n> <vlanid>"

Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
CC: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d5bc77a2

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

+2 −4
Original line number Diff line number Diff line
@@ -293,12 +293,10 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, 
{

	struct ixgbevf_adapter *adapter = q_vector->adapter;

	bool is_vlan = (status & IXGBE_RXD_STAT_VP);



	if (is_vlan) {

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



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

		__vlan_hwaccel_put_tag(skb, tag);

	}



	if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL))

			napi_gro_receive(&q_vector->napi, skb);