diff options
| author | Nick Nunley <[email protected]> | 2020-07-30 00:19:19 +0000 |
|---|---|---|
| committer | Tony Nguyen <[email protected]> | 2020-08-01 15:44:04 +0000 |
| commit | 68d210a609a048dde1b7c23385d9bafb0061acb3 (patch) | |
| tree | 9f60bcefd6849545e3a1ddfc286858ce9a4ac383 /drivers/net/ethernet/intel/ice/ice_lib.c | |
| parent | ice: Graceful error handling in HW table calloc failure (diff) | |
| download | kernel-68d210a609a048dde1b7c23385d9bafb0061acb3.tar.gz kernel-68d210a609a048dde1b7c23385d9bafb0061acb3.zip | |
ice: Disable VLAN pruning in promiscuous mode
Disable VLAN pruning when entering promiscuous mode, and re-enable it
when exiting.
Without this VLAN-over-bridge topologies created on the device won't be
functional unless rx-vlan-filter is explicitly disabled with ethtool.
Signed-off-by: Nick Nunley <[email protected]>
Tested-by: Andrew Bowers <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_lib.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_lib.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c index 84202c814c3b..f2682776f8c8 100644 --- a/drivers/net/ethernet/intel/ice/ice_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_lib.c @@ -2017,6 +2017,13 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc) if (!vsi) return -EINVAL; + /* Don't enable VLAN pruning if the netdev is currently in promiscuous + * mode. VLAN pruning will be enabled when the interface exits + * promiscuous mode if any VLAN filters are active. + */ + if (vsi->netdev && vsi->netdev->flags & IFF_PROMISC && ena) + return 0; + pf = vsi->back; ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); if (!ctxt) |