Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f123f2fb authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: pass bridge device when a port leaves 



Upon reception of the NETDEV_CHANGEUPPER, a leaving port is already
unbridged, so reflect this by assigning the port's bridge_dev pointer to
NULL before calling the port_bridge_leave DSA driver operation.

Now that the bridge_dev pointer is exposed to the drivers, reflecting
the current state of the DSA switch fabric is necessary for the drivers
to adjust their port based VLANs correctly.

Pass the bridge device pointer to the port_bridge_leave operation so
that drivers have all information to re-program their chips properly,
and do not need to cache it anymore.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5e9a02e

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge) 
}

EXPORT_SYMBOL(b53_br_join);



void b53_br_leave(struct dsa_switch *ds, int port)

void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)

{

	struct b53_device *dev = ds->priv;

	struct net_device *bridge = dev->ports[port].bridge_dev;

drivers/net/dsa/b53/b53_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data); 
void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_get_sset_count(struct dsa_switch *ds);

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

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

void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *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);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);

drivers/net/dsa/mv88e6xxx/chip.c

+2 −1
Original line number Diff line number Diff line
@@ -2343,7 +2343,8 @@ static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, 
	return err;

}



static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port)

static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,

					struct net_device *br)

{

	struct mv88e6xxx_chip *chip = ds->priv;

	struct net_device *bridge = chip->ports[port].bridge_dev;

drivers/net/dsa/qca8k.c

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, 
}



static void

qca8k_port_bridge_leave(struct dsa_switch *ds, int port)

qca8k_port_bridge_leave(struct dsa_switch *ds, int port, struct net_device *br)

{

	struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv;

	int i;

include/net/dsa.h

+2 −1
Original line number Diff line number Diff line
@@ -325,7 +325,8 @@ struct dsa_switch_ops { 
	int	(*set_ageing_time)(struct dsa_switch *ds, unsigned int msecs);

	int	(*port_bridge_join)(struct dsa_switch *ds, int port,

				    struct net_device *bridge);

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

	void	(*port_bridge_leave)(struct dsa_switch *ds, int port,

				     struct net_device *bridge);

	void	(*port_stp_state_set)(struct dsa_switch *ds, int port,

				      u8 state);

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