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>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 84202c8..f268277 100644 (file)
--- 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)

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 22bbd84..22e3d32 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -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);
                        }
                }
        }