]> git.baikalelectronics.ru Git - kernel.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)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 16 Sep 2015 00:06:04 +0000 (17:06 -0700)
commite627b68d26af58a727c0cec54235ccd522e6691d
treec320de06999b41fb8628dab79e834645704c5aea
parentda010ffe65b75de93e3e6c335c2511e44f1b8a14
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>
drivers/net/ethernet/intel/fm10k/fm10k_main.c
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
drivers/net/ethernet/intel/fm10k/fm10k_pci.c