Commit 06b9cce4 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: pass extack to .port_bridge_join driver methods 



As FDB isolation cannot be enforced between VLAN-aware bridges in lack
of hardware assistance like extra FID bits, it seems plausible that many
DSA switches cannot do it. Therefore, they need to reject configurations
with multiple VLAN-aware bridges from the two code paths that can
transition towards that state:

- joining a VLAN-aware bridge
- toggling VLAN awareness on an existing bridge

The .port_vlan_filtering method already propagates the netlink extack to
the driver, let's propagate it from .port_bridge_join too, to make sure
that the driver can use the same function for both.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2693363

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,7 @@ 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,

		bool *tx_fwd_offload)

		bool *tx_fwd_offload, struct netlink_ext_ack *extack)

{

	struct b53_device *dev = ds->priv;

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

drivers/net/dsa/b53/b53_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ 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,

		bool *tx_fwd_offload);

		bool *tx_fwd_offload, struct netlink_ext_ack *extack);

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
@@ -168,7 +168,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,

				     bool *tx_fwd_offload)

				     bool *tx_fwd_offload,

				     struct netlink_ext_ack *extack)

{

	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
@@ -675,7 +675,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,

				      bool *tx_fwd_offload)

				      bool *tx_fwd_offload,

				      struct netlink_ext_ack *extack)

{

	struct hellcreek *hellcreek = ds->priv;

drivers/net/dsa/lan9303-core.c

+2 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,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,

				    bool *tx_fwd_offload)

				    bool *tx_fwd_offload,

				    struct netlink_ext_ack *extack)

{

	struct lan9303 *chip = ds->priv;