ice: Remove vlan_ena from vsi structure
authorNick Nunley <nicholas.d.nunley@intel.com>
Thu, 17 Sep 2020 20:13:43 +0000 (13:13 -0700)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 9 Dec 2020 16:11:54 +0000 (08:11 -0800)
commitbcf68ea1e580df685a4a9cec4dfaf0f0f4393dbe
treed5ab5e691ef1ac3cf502e955ce7e0e46a9cf53e0
parent956542cae5dc7a6e688badee721de168c8e9fbd8
ice: Remove vlan_ena from vsi structure

vlan_ena was introduced to track whether VLAN filters are enabled on
the device, but
1) checking for num_vlan > 1 already gives us this information, and is
currently used in this way throughout the code
2) the logic for vlan_ena is broken when multiple VLANs are active

Just remove vlan_ena and use num_vlan instead.

Signed-off-by: Nick Nunley <nicholas.d.nunley@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_main.c