Commit da0efa88 authored May 30, 2018 by Petr Machata Committed by David S. Miller May 31, 2018

dsa: port: Ignore bridge VLAN events



A follow-up patch enables emitting VLAN notifications for the bridge CPU
port in addition to the existing slave port notifications. These
notifications have orig_dev set to the bridge in question.

Because there's no specific support for these VLANs, just ignore the
notifications to maintain the current behavior.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2855118f

net/dsa/port.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -252,6 +252,9 @@ 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);

		@@ -267,6 +270,9 @@ int dsa_port_vlan_del(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_DEL, &info);

Admin message