Commit b079922b authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: add a "tx_fwd_offload" argument to ->port_bridge_join 



This is a preparation patch for the removal of the DSA switch methods
->port_bridge_tx_fwd_offload() and ->port_bridge_tx_fwd_unoffload().
The plan is for the switch to report whether it offloads TX forwarding
directly as a response to the ->port_bridge_join() method.

This change deals with the noisy portion of converting all existing
function prototypes to take this new boolean pointer argument.
The bool is placed in the cross-chip notifier structure for bridge join,
and a reference to it is provided to drivers. In the next change, DSA
will then actually look at this value instead of calling
->port_bridge_tx_fwd_offload().

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d3eed0e5

drivers/net/dsa/b53/b53_common.c

+2 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,8 @@ int b53_mdb_del(struct dsa_switch *ds, int port, 
}

EXPORT_SYMBOL(b53_mdb_del);



int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge)

int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,

		bool *tx_fwd_offload)

{

	struct b53_device *dev = ds->priv;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

drivers/net/dsa/b53/b53_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, 
void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_get_sset_count(struct dsa_switch *ds, int port, int sset);

void b53_get_ethtool_phy_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge);

int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,

		bool *tx_fwd_offload);

void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge);

void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state);

void b53_br_fast_age(struct dsa_switch *ds, int port);

drivers/net/dsa/dsa_loop.c

+2 −1
Original line number Diff line number Diff line
@@ -167,7 +167,8 @@ static int dsa_loop_phy_write(struct dsa_switch *ds, int port, 
}



static int dsa_loop_port_bridge_join(struct dsa_switch *ds, int port,

				     struct dsa_bridge bridge)

				     struct dsa_bridge bridge,

				     bool *tx_fwd_offload)

{

	dev_dbg(ds->dev, "%s: port: %d, bridge: %s\n",

		__func__, port, bridge.dev->name);

drivers/net/dsa/hirschmann/hellcreek.c

+2 −1
Original line number Diff line number Diff line
@@ -674,7 +674,8 @@ static int hellcreek_bridge_flags(struct dsa_switch *ds, int port, 
}



static int hellcreek_port_bridge_join(struct dsa_switch *ds, int port,

				      struct dsa_bridge bridge)

				      struct dsa_bridge bridge,

				      bool *tx_fwd_offload)

{

	struct hellcreek *hellcreek = ds->priv;

drivers/net/dsa/lan9303-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,8 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port) 
}



static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,

				    struct dsa_bridge bridge)

				    struct dsa_bridge bridge,

				    bool *tx_fwd_offload)

{

	struct lan9303 *chip = ds->priv;