Message ID | 20231016164742.264613-1-florian.fainelli@broadcom.com (mailing list archive) |
---|---|
Headers | show |
Series | Switch DSA to inclusive terminology | expand |
On Mon, 16 Oct 2023 09:47:41 -0700 Florian Fainelli <florian.fainelli@broadcom.com> wrote: > Use more inclusive terms throughout the DSA subsystem by moving away > from "master" which is replaced by "conduit" and "slave" which is > replaced by "user". No functional changes. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > --- > .../bindings/net/dsa/mediatek,mt7530.yaml | 2 +- > Documentation/networking/dsa/b53.rst | 14 +- > Documentation/networking/dsa/bcm_sf2.rst | 2 +- > .../networking/dsa/configuration.rst | 100 +- > Documentation/networking/dsa/dsa.rst | 162 +- > Documentation/networking/dsa/lan9303.rst | 2 +- > Documentation/networking/dsa/sja1105.rst | 6 +- > .../dts/marvell/armada-3720-espressobin.dtsi | 2 +- > drivers/net/dsa/b53/b53_common.c | 4 +- > drivers/net/dsa/b53/b53_mdio.c | 2 +- > drivers/net/dsa/bcm_sf2.c | 36 +- > drivers/net/dsa/bcm_sf2.h | 2 +- > drivers/net/dsa/bcm_sf2_cfp.c | 4 +- > drivers/net/dsa/lan9303-core.c | 4 +- > drivers/net/dsa/lantiq_gswip.c | 34 +- > drivers/net/dsa/microchip/ksz9477.c | 6 +- > drivers/net/dsa/microchip/ksz_common.c | 20 +- > drivers/net/dsa/microchip/ksz_ptp.c | 2 +- > drivers/net/dsa/mt7530.c | 16 +- > drivers/net/dsa/mv88e6xxx/chip.c | 2 +- > drivers/net/dsa/ocelot/felix.c | 68 +- > drivers/net/dsa/ocelot/felix.h | 6 +- > drivers/net/dsa/qca/qca8k-8xxx.c | 50 +- > drivers/net/dsa/qca/qca8k-common.c | 2 +- > drivers/net/dsa/qca/qca8k-leds.c | 6 +- > drivers/net/dsa/qca/qca8k.h | 2 +- > drivers/net/dsa/realtek/realtek-smi.c | 28 +- > drivers/net/dsa/realtek/realtek.h | 2 +- > drivers/net/dsa/sja1105/sja1105_main.c | 4 +- > drivers/net/dsa/xrs700x/xrs700x.c | 12 +- > drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- > .../net/ethernet/mediatek/mtk_ppe_offload.c | 2 +- > include/linux/dsa/sja1105.h | 2 +- > include/net/dsa.h | 56 +- > include/net/dsa_stubs.h | 22 +- > net/core/dev_ioctl.c | 2 +- > net/dsa/Makefile | 6 +- > net/dsa/{master.c => conduit.c} | 118 +- > net/dsa/conduit.h | 22 + > net/dsa/dsa.c | 224 +-- > net/dsa/dsa.h | 12 +- > net/dsa/master.h | 22 - > net/dsa/netlink.c | 14 +- > net/dsa/port.c | 124 +- > net/dsa/port.h | 4 +- > net/dsa/slave.h | 69 - > net/dsa/switch.c | 20 +- > net/dsa/switch.h | 8 +- > net/dsa/tag.c | 10 +- > net/dsa/tag.h | 26 +- > net/dsa/tag_8021q.c | 22 +- > net/dsa/tag_8021q.h | 2 +- > net/dsa/tag_ar9331.c | 4 +- > net/dsa/tag_brcm.c | 14 +- > net/dsa/tag_dsa.c | 6 +- > net/dsa/tag_gswip.c | 4 +- > net/dsa/tag_hellcreek.c | 4 +- > net/dsa/tag_ksz.c | 12 +- > net/dsa/tag_lan9303.c | 4 +- > net/dsa/tag_mtk.c | 4 +- > net/dsa/tag_none.c | 6 +- > net/dsa/tag_ocelot.c | 22 +- > net/dsa/tag_ocelot_8021q.c | 12 +- > net/dsa/tag_qca.c | 6 +- > net/dsa/tag_rtl4_a.c | 6 +- > net/dsa/tag_rtl8_4.c | 6 +- > net/dsa/tag_rzn1_a5psw.c | 4 +- > net/dsa/tag_sja1105.c | 30 +- > net/dsa/tag_trailer.c | 4 +- > net/dsa/tag_xrs700x.c | 4 +- > net/dsa/{slave.c => user.c} | 1464 ++++++++--------- > net/dsa/user.h | 69 + > 73 files changed, 1541 insertions(+), 1537 deletions(-) > rename net/dsa/{master.c => conduit.c} (76%) > create mode 100644 net/dsa/conduit.h > delete mode 100644 net/dsa/master.h > delete mode 100644 net/dsa/slave.h > rename net/dsa/{slave.c => user.c} (62%) > create mode 100644 net/dsa/user.h Thanks for doing this. Acked-by: Stephen Hemminger <stephen@networkplumber.org>
On Mon, Oct 16, 2023 at 09:47:41AM -0700, Florian Fainelli wrote: > Use more inclusive terms throughout the DSA subsystem by moving away > from "master" which is replaced by "conduit" and "slave" which is > replaced by "user". No functional changes. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> Note that you left the following unconverted: diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index d117e9b1a465..d27c6b70a2f6 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -1113,7 +1113,7 @@ mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) u32 val; /* When a new MTU is set, DSA always set the CPU port's MTU to the - * largest MTU of the slave ports. Because the switch only has a global + * largest MTU of the user ports. Because the switch only has a global * RX length register, only allowing CPU port here is enough. */ if (!dsa_is_cpu_port(ds, port)) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index be2491de173d..42b1acaca33a 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2486,7 +2486,7 @@ static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port, else member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_TAGGED; - /* net/dsa/slave.c will call dsa_port_vlan_add() for the affected port + /* net/dsa/user.c will call dsa_port_vlan_add() for the affected port * and then the CPU port. Do not warn for duplicates for the CPU port. */ warn = !dsa_is_cpu_port(ds, port) && !dsa_is_dsa_port(ds, port); diff --git a/drivers/net/dsa/qca/qca8k-common.c b/drivers/net/dsa/qca/qca8k-common.c index d203e4a84441..9243eff8918d 100644 --- a/drivers/net/dsa/qca/qca8k-common.c +++ b/drivers/net/dsa/qca/qca8k-common.c @@ -761,7 +761,7 @@ int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu) int ret; /* We have only have a general MTU setting. - * DSA always set the CPU port's MTU to the largest MTU of the slave + * DSA always set the CPU port's MTU to the largest MTU of the user * ports. * Setting MTU just for the CPU port is sufficient to correctly set a * value for every port. diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c index d171c18dd354..0875e4fc9f57 100644 --- a/drivers/net/dsa/realtek/rtl8365mb.c +++ b/drivers/net/dsa/realtek/rtl8365mb.c @@ -1144,7 +1144,7 @@ static int rtl8365mb_port_change_mtu(struct dsa_switch *ds, int port, int frame_size; /* When a new MTU is set, DSA always sets the CPU port's MTU to the - * largest MTU of the slave ports. Because the switch only has a global + * largest MTU of the user ports. Because the switch only has a global * RX length register, only allowing CPU port here is enough. */ if (!dsa_is_cpu_port(ds, port))
On 10/17/2023 3:03 AM, Vladimir Oltean wrote: > On Mon, Oct 16, 2023 at 09:47:41AM -0700, Florian Fainelli wrote: >> Use more inclusive terms throughout the DSA subsystem by moving away >> from "master" which is replaced by "conduit" and "slave" which is >> replaced by "user". No functional changes. >> >> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> >> --- > > Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com> > > Note that you left the following unconverted: Bah, thanks, sent a v5 with those additions. Thank you!