fm10k: only prevent removal of default VID rules
authorJacob Keller <jacob.e.keller@intel.com>
Mon, 15 Jun 2015 22:00:53 +0000 (15:00 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 16 Sep 2015 00:05:23 +0000 (17:05 -0700)
commit56f0569e3ab741d3c5cebc4b4c882b471df53738
tree9eacbf24adbf24a972fd92da3003576263f4a505
parente40296628bec7400f529927eef4bc87cb425a22a
fm10k: only prevent removal of default VID rules

This allows us to correctly add a VLAN even if it matches our default
VID. However, we don't want to remove the VID rules once that VLAN is
deleted. Correctly remove the stack layers information of the VLAN, but
then return to forwarding that VID as untagged frames. If we deleted the
VID rules here, we would begin dropping traffic due to VLAN membership
violations.

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_netdev.c