ice: Remove vlan_ena from vsi structure

Browse source

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>

...

This commit is contained in:

Nick Nunley 2020-09-17 13:13:43 -07:00 • committed by Tony Nguyen

parent 956542cae5

commit bcf68ea1e5

2 changed files with 4 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/net/ethernet/intel/ice/ice.h

View file

11

drivers/net/ethernet/intel/ice/ice_main.c

View file