]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ixgbevf: fix VF untagging when 802.1 prio is set
authorPascal Bouchareine <pascal@gandi.net>
Thu, 14 Jun 2012 02:18:18 +0000 (02:18 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 18 Jul 2012 20:09:40 +0000 (13:09 -0700)
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: Pascal Bouchareine <pascal@gandi.net>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index c98cdf7de49d1051d5bc569a705c94eee9d9cfa9..b88218c7f60f723b9f235479bfbd55cecee7d315 100644 (file)
@@ -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);