]> www.infradead.org Git - users/jedix/linux-maple.git/commit
fm10k: send traffic on default VID to VLAN device if we have one
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 24 Jun 2015 20:34:46 +0000 (13:34 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 06:02:50 +0000 (22:02 -0800)
commitec804db43b5ba014788cbffcaf1585ed3a7bb9f6
treeb0d7176cd206a987ac3a409fca9b94ac6d8e7f96
parent44d0abba567613e01333c7de9e2d03d05962e450
fm10k: send traffic on default VID to VLAN device if we have one

This patch ensures that VLAN traffic on the default VID will go to the
corresponding VLAN device if it exists. To do this, mask the rx_ring VID
if we have an active VLAN on that VID.

For this to work correctly, we need to update fm10k_process_skb_fields
to correctly mask off the VLAN_PRIO_MASK bits and compare them
separately, otherwise we incorrectly compare the priority bits with the
cleared flag. This also happens to fix a related bug where having
priority bits set causes us to incorrectly classify traffic.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529

(cherry picked from commit e71c9318428fb16de808b497e0229994010d32a1)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/fm10k/fm10k_main.c
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
drivers/net/ethernet/intel/fm10k/fm10k_pci.c