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

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

net: dsa: rename port_*_bridge routines 



Rename DSA port_join_bridge and port_leave_bridge routines to
respectively port_bridge_join and port_bridge_leave in order to respect
an implicit Port::Bridge namespace.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e1589ad

Documentation/networking/dsa/dsa.txt

+2 −2
Original line number Diff line number Diff line
@@ -521,12 +521,12 @@ See Documentation/hwmon/sysfs-interface for details. 
Bridge layer

------------



- port_join_bridge: bridge layer function invoked when a given switch port is

- port_bridge_join: bridge layer function invoked when a given switch port is

  added to a bridge, this function should be doing the necessary at the switch

  level to permit the joining port from being added to the relevant logical

  domain for it to ingress/egress traffic with other members of the bridge.



- port_leave_bridge: bridge layer function invoked when a given switch port is

- port_bridge_leave: bridge layer function invoked when a given switch port is

  removed from a bridge, this function should be doing the necessary at the

  switch level to deny the leaving port from ingress/egress traffic from the

  remaining bridge members. When the port leaves the bridge, it should be aged

drivers/net/dsa/bcm_sf2.c

+2 −2
Original line number Diff line number Diff line
@@ -1387,8 +1387,8 @@ static struct dsa_switch_driver bcm_sf2_switch_driver = { 
	.port_disable		= bcm_sf2_port_disable,

	.get_eee		= bcm_sf2_sw_get_eee,

	.set_eee		= bcm_sf2_sw_set_eee,

	.port_join_bridge	= bcm_sf2_sw_br_join,

	.port_leave_bridge	= bcm_sf2_sw_br_leave,

	.port_bridge_join	= bcm_sf2_sw_br_join,

	.port_bridge_leave	= bcm_sf2_sw_br_leave,

	.port_stp_update	= bcm_sf2_sw_br_set_stp_state,

	.port_fdb_prepare	= bcm_sf2_sw_fdb_prepare,

	.port_fdb_add		= bcm_sf2_sw_fdb_add,

drivers/net/dsa/mv88e6171.c

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ struct dsa_switch_driver mv88e6171_switch_driver = { 
#endif

	.get_regs_len		= mv88e6xxx_get_regs_len,

	.get_regs		= mv88e6xxx_get_regs,

	.port_join_bridge	= mv88e6xxx_port_bridge_join,

	.port_leave_bridge	= mv88e6xxx_port_bridge_leave,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

	.port_stp_update        = mv88e6xxx_port_stp_update,

	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,

	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,

drivers/net/dsa/mv88e6352.c

+2 −2
Original line number Diff line number Diff line
@@ -324,8 +324,8 @@ struct dsa_switch_driver mv88e6352_switch_driver = { 
	.set_eeprom		= mv88e6352_set_eeprom,

	.get_regs_len		= mv88e6xxx_get_regs_len,

	.get_regs		= mv88e6xxx_get_regs,

	.port_join_bridge	= mv88e6xxx_port_bridge_join,

	.port_leave_bridge	= mv88e6xxx_port_bridge_leave,

	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

	.port_stp_update	= mv88e6xxx_port_stp_update,

	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,

	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,

include/net/dsa.h

+2 −2
Original line number Diff line number Diff line
@@ -296,9 +296,9 @@ struct dsa_switch_driver { 
	/*

	 * Bridge integration

	 */

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

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

				    struct net_device *bridge);

	int	(*port_leave_bridge)(struct dsa_switch *ds, int port);

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

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

				   u8 state);