Commit e6dd86ed authored by Florian Fainelli's avatar Florian Fainelli Committed by Jakub Kicinski
Browse files

net: dsa: bcm_sf2: Wire-up br_flags_pre, br_flags and set_mrouter 



Because bcm_sf2 implements its own dsa_switch_ops we need to export the
b53_br_flags_pre(), b53_br_flags() and b53_set_mrouter so we can wire-up
them up like they used to be with the former b53_br_egress_floods().

Fixes: a8b659e7 ("net: dsa: act as passthrough for bridge port flags")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 18755e27

drivers/net/dsa/b53/b53_common.c

+11 −8
Original line number Diff line number Diff line
@@ -1953,7 +1953,7 @@ void b53_br_fast_age(struct dsa_switch *ds, int port) 
}

EXPORT_SYMBOL(b53_br_fast_age);



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

int b53_br_flags_pre(struct dsa_switch *ds, int port,

		     struct switchdev_brport_flags flags,

		     struct netlink_ext_ack *extack)

{
@@ -1962,8 +1962,9 @@ static int b53_br_flags_pre(struct dsa_switch *ds, int port, 


	return 0;

}

EXPORT_SYMBOL(b53_br_flags_pre);



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

int b53_br_flags(struct dsa_switch *ds, int port,

		 struct switchdev_brport_flags flags,

		 struct netlink_ext_ack *extack)

{
@@ -1976,14 +1977,16 @@ static int b53_br_flags(struct dsa_switch *ds, int port, 


	return 0;

}

EXPORT_SYMBOL(b53_br_flags);



static int b53_set_mrouter(struct dsa_switch *ds, int port, bool mrouter,

int b53_set_mrouter(struct dsa_switch *ds, int port, bool mrouter,

		    struct netlink_ext_ack *extack)

{

	b53_port_set_mcast_flood(ds->priv, port, mrouter);



	return 0;

}

EXPORT_SYMBOL(b53_set_mrouter);



static bool b53_possible_cpu_port(struct dsa_switch *ds, int port)

{

drivers/net/dsa/b53/b53_priv.h

+8 −0
Original line number Diff line number Diff line
@@ -326,6 +326,14 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge); 
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_br_flags_pre(struct dsa_switch *ds, int port,

		     struct switchdev_brport_flags flags,

		     struct netlink_ext_ack *extack);

int b53_br_flags(struct dsa_switch *ds, int port,

		 struct switchdev_brport_flags flags,

		 struct netlink_ext_ack *extack);

int b53_set_mrouter(struct dsa_switch *ds, int port, bool mrouter,

		    struct netlink_ext_ack *extack);

int b53_setup_devlink_resources(struct dsa_switch *ds);

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

void b53_phylink_validate(struct dsa_switch *ds, int port,

drivers/net/dsa/bcm_sf2.c

+3 −0
Original line number Diff line number Diff line
@@ -1117,7 +1117,10 @@ static const struct dsa_switch_ops bcm_sf2_ops = { 
	.set_mac_eee		= b53_set_mac_eee,

	.port_bridge_join	= b53_br_join,

	.port_bridge_leave	= b53_br_leave,

	.port_pre_bridge_flags	= b53_br_flags_pre,

	.port_bridge_flags	= b53_br_flags,

	.port_stp_state_set	= b53_br_set_stp_state,

	.port_set_mrouter	= b53_set_mrouter,

	.port_fast_age		= b53_br_fast_age,

	.port_vlan_filtering	= b53_vlan_filtering,

	.port_vlan_add		= b53_vlan_add,