ice: Preserve VLAN Rx stripping settings
authorTony Nguyen <anthony.l.nguyen@intel.com>
Tue, 16 Apr 2019 17:21:15 +0000 (10:21 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 4 May 2019 20:45:00 +0000 (13:45 -0700)
commite80e76db6c5bbc7a8f8512f3dc630a2170745b0b
tree280cba89fb4059844b1102750847bf2d5d052d2d
parenta52db6b2601f9904ce7fc4b32537823e5c1eb9ef
ice: Preserve VLAN Rx stripping settings

When Tx insertion is set, we are not accounting for the state of Rx
stripping.  This causes Rx stripping to be enabled any time Tx
insertion is changed, even when it's supposed to be disabled.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c