net: dsa: tag_8021q: stop restoring VLANs from bridge
Subsystems (3)
Vladimir Oltean
maintainerPATCH 1/1 net: dsa: tag_8021q: stop restoring VLANs from bridge
From: Vladimir Oltean <[email protected]>
Right now, our only tag_8021q user, sja1105, has the ability to restore bridge VLANs on its own, so this logic is unnecessary.
Signed-off-by Vladimir Oltean <[email protected]>
--- net/dsa/tag_8021q.c | 61 +-------------------------------------------- 1 file changed, 1 insertion(+), 60 deletions(-)
net/dsa/tag_8021q.c +1 -60
@@ -140,34 +140,6 @@ bool vid_is_dsa_8021q(u16 vid) }EXPORT_SYMBOL_GPL (vid_is_dsa_8021q); -static int dsa_8021q_restore_pvid (struct dsa_switch *ds,int port) -{ -struct bridge_vlan_info vinfo; -struct net_device *slave; -u16 pvid; -int err; - -if (!dsa_is_user_port (ds, port)) -return 0 ; - - slave =dsa_to_port (ds, port)->slave; - - err =br_vlan_get_pvid (slave, &pvid); -if (!pvid || err <0 ) -/* There is no pvid on the bridge for this port, which is -* perfectly valid. Nothing to restore, bye-bye! -*/ -return 0 ; - - err =br_vlan_get_info (slave, pvid, &vinfo); -if (err <0 ) { -dev_err (ds->dev,"Couldn't determine PVID attributes\n" ); -return err; - } - -return dsa_port_vid_add (dsa_to_port (ds, port), pvid, vinfo.flags); -} -/* If @enabled is true, installs @vid with @flags into the switch port's HW * filter. * If @enabled is false, deletes @vid (ignores @flags) from the port. Had the
@@ -178,39 +150,11 @@ static int dsa_8021q_vid_apply(struct dsa_switch *ds, int port, u16 vid, u16 flags, bool enabled) {struct dsa_port *dp =dsa_to_port (ds, port); -struct bridge_vlan_info vinfo; -int err;if (enabled)return dsa_port_vid_add (dp, vid, flags); - err =dsa_port_vid_del (dp, vid); -if (err <0 ) -return err; - -/* Nothing to restore from the bridge for a non-user port. -* The CPU port VLANs are restored implicitly with the user ports, -* similar to how the bridge does in dsa_slave_vlan_add and -* dsa_slave_vlan_del. -*/ -if (!dsa_is_user_port (ds, port)) -return 0 ; - - err =br_vlan_get_info (dp->slave, vid, &vinfo); -/* Couldn't determine bridge attributes for this vid, -* it means the bridge had not configured it. -*/ -if (err <0 ) -return 0 ; - -/* Restore the VID from the bridge */ - err =dsa_port_vid_add (dp, vid, vinfo.flags); -if (err <0 ) -return err; - - vinfo.flags &= ~BRIDGE_VLAN_INFO_PVID ; - -return dsa_port_vid_add (dp->cpu_dp, vid, vinfo.flags); +return dsa_port_vid_del (dp, vid); }/* RX VLAN tagging (left) and TX VLAN tagging (right) setup shown for a single
@@ -329,9 +273,6 @@ int dsa_port_setup_8021q_tagging(struct dsa_switch *ds, int port, bool enabled)return err; } -if (!enabled) - err =dsa_8021q_restore_pvid (ds, port); -return err; }EXPORT_SYMBOL_GPL (dsa_port_setup_8021q_tagging);
Signature · 1 line
2.25.1
From: Vladimir Oltean <[email protected]>
Date: Wed, 27 May 2020 19:41:34 +0300
Quoted 6 lines
From: Vladimir Oltean <[email protected]>
Right now, our only
tag_8021quser, sja1105, has the ability to restore bridge VLANs on its own, so this logic is unnecessary.Signed-off-by Vladimir Oltean <[email protected]>
The tagging code had no business doing this anyways I think.
Applied, thanks.