Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4a1686 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

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: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d17d9f5e

drivers/net/ethernet/rocker/rocker_main.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

net/dsa/port.c

+0 −3
Original line number Diff line number Diff line
@@ -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);