net: dsa: do not check orig_dev in vlan del (14aafbd8) · Commits · 戴 / test

The current DSA code handling switchdev objects does not recurse into the lower devices thus is never called with an orig_dev member being a bridge device, hence remove this useless check. At the same time, remove the comments about the callers, which is unlikely to be updated if the code changes and thus will be confusing. Signed-off-by:

Vivien Didelot <vivien.didelot@gmail.com> Reviewed-by:

Florian Fainelli <f.fainelli@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/dsa/port.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -336,9 +336,6 @@ int dsa_port_vlan_add(struct dsa_port *dp,
		.vlan = vlan,
		};

		/* Can be called from dsa_slave_port_obj_add() or
		* dsa_slave_vlan_rx_add_vid()
		*/
		if (!dp->bridge_dev \|\| br_vlan_enabled(dp->bridge_dev))
		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);

		@@ -354,12 +351,6 @@ int dsa_port_vlan_del(struct dsa_port *dp,
		.vlan = vlan,
		};

		if (vlan->obj.orig_dev && netif_is_bridge_master(vlan->obj.orig_dev))
		return -EOPNOTSUPP;

		/* Can be called from dsa_slave_port_obj_del() or
		* dsa_slave_vlan_rx_kill_vid()
		*/
		if (!dp->bridge_dev \|\| br_vlan_enabled(dp->bridge_dev))
		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);

Admin message