Commit 68d210a6 authored Jul 29, 2020 by Nick Nunley Committed by Tony Nguyen Aug 01, 2020

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 <nicholas.d.nunley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

parent bcc46cb8

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -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)

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
		~IFF_PROMISC;
		goto out_promisc;
		}
		ice_cfg_vlan_pruning(vsi, false, false);
		}
		} else {
		/* Clear Rx filter to remove traffic from wire */
		@@ -381,6 +382,8 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
		IFF_PROMISC;
		goto out_promisc;
		}
		if (vsi->num_vlan > 1)
		ice_cfg_vlan_pruning(vsi, true, false);
		}
		}
		}