Commit 85aabd1f authored by Pawel Dembicki's avatar Pawel Dembicki Committed by Jakub Kicinski
Browse files

net: dsa: prepare 'dsa_tag_8021q_bridge_join' for standalone use 



The 'dsa_tag_8021q_bridge_join' could be used as a generic implementation
of the 'ds->ops->port_bridge_join()' function. However, it is necessary
to synchronize their arguments.

This patch also moves the 'tx_fwd_offload' flag configuration line into
'dsa_tag_8021q_bridge_join' body. Currently, every (sja1105) driver sets
it, and the future vsc73xx implementation will also need it for
simplification.

Suggested-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarPawel Dembicki <paweldembicki@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/20240713211620.1125910-11-paweldembicki@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ce20fdd6

drivers/net/dsa/sja1105/sja1105_main.c

+2 −3
Original line number Diff line number Diff line
@@ -2133,14 +2133,13 @@ static int sja1105_bridge_join(struct dsa_switch *ds, int port, 
	if (rc)

		return rc;



	rc = dsa_tag_8021q_bridge_join(ds, port, bridge);

	rc = dsa_tag_8021q_bridge_join(ds, port, bridge, tx_fwd_offload,

				       extack);

	if (rc) {

		sja1105_bridge_member(ds, port, bridge, false);

		return rc;

	}



	*tx_fwd_offload = true;



	return 0;

}

include/linux/dsa/8021q.h

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ int dsa_tag_8021q_register(struct dsa_switch *ds, __be16 proto); 
void dsa_tag_8021q_unregister(struct dsa_switch *ds);



int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port,

			      struct dsa_bridge bridge);

			      struct dsa_bridge bridge, bool *tx_fwd_offload,

			      struct netlink_ext_ack *extack);



void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,

				struct dsa_bridge bridge);

net/dsa/tag_8021q.c

+4 −1
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ int dsa_switch_tag_8021q_vlan_del(struct dsa_switch *ds, 
 * be used for VLAN-unaware bridging.

 */

int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port,

			      struct dsa_bridge bridge)

			      struct dsa_bridge bridge, bool *tx_fwd_offload,

			      struct netlink_ext_ack *extack)

{

	struct dsa_port *dp = dsa_to_port(ds, port);

	u16 standalone_vid, bridge_vid;
@@ -304,6 +305,8 @@ int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port, 


	dsa_port_tag_8021q_vlan_del(dp, standalone_vid, false);



	*tx_fwd_offload = true;



	return 0;

}

EXPORT_SYMBOL_GPL(dsa_tag_8021q_bridge_join);