rocker, dsa, ethsw: Don't filter VLAN events on bridge itself

Due to an explicit check in rocker_world_port_obj_vlan_add(),
dsa_slave_switchdev_event() resp. port_switchdev_event(), VLAN objects
that are added to a device that is not a front-panel port device are
ignored. Therefore this check is immaterial.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c
index f05d5c1341b6804c9c59a5fc9f5921f97e73d3d3..6213827e3956486a47b8e924a04f410de0dca79c 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker_main.c
+++ b/drivers/net/ethernet/rocker/rocker_main.c
@@ -1632,9 +1632,6 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port,
 {
        struct rocker_world_ops *wops = rocker_port->rocker->wops;
 
-       if (netif_is_bridge_master(vlan->obj.orig_dev))
-               return -EOPNOTSUPP;
-
        if (!wops->port_obj_vlan_add)
                return -EOPNOTSUPP;
 

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index 06a233c7cdd350013aab885a8a75cc37fcab3e92..4fa37d6e598b8c59e9cf78812d8a12285531f984 100644 (file)
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -719,9 +719,6 @@ static int port_vlans_add(struct net_device *netdev,
        struct ethsw_port_priv *port_priv = netdev_priv(netdev);
        int vid, err = 0;
 
-       if (netif_is_bridge_master(vlan->obj.orig_dev))
-               return -EOPNOTSUPP;
-
        if (switchdev_trans_ph_prepare(trans))
                return 0;
 

diff --git a/net/dsa/port.c b/net/dsa/port.c
index ed0595459df13e61c10bd18fe0025d61f5837d97..2d7e01b23572877423aabd002e7e74315e320882 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -252,9 +252,6 @@ int dsa_port_vlan_add(struct dsa_port *dp,
                .vlan = vlan,
        };
 
-       if (netif_is_bridge_master(vlan->obj.orig_dev))
-               return -EOPNOTSUPP;
-
        if (br_vlan_enabled(dp->bridge_dev))
                return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);