igbvf: Fix trunk vlan
Changes to clean up the VLAN Rx path by Jiri Pirko broke trunk VLAN. Trunk VLANs in a VF driver are those set using "ip link set <pfdev> vf <n> <vlanid>" Signed-off-by: Greg Rose <gregory.v.rose@intel.com> CC: Jiri Pirko <jpirko@redhat.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
fd38f734cb
commit
4d2d55ac94
|
@ -102,8 +102,8 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter,
|
|||
{
|
||||
if (status & E1000_RXD_STAT_VP) {
|
||||
u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
|
||||
|
||||
__vlan_hwaccel_put_tag(skb, vid);
|
||||
if (test_bit(vid, adapter->active_vlans))
|
||||
__vlan_hwaccel_put_tag(skb, vid);
|
||||
}
|
||||
netif_receive_skb(skb);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue