Messages in this thread | | | From | Florian Fainelli <> | Subject | [PATCH net-next v2 0/2] Switch DSA to inclusive terminology | Date | Wed, 11 Oct 2023 15:20:24 -0700 |
| |
One of the action items following Netconf'23 is to switch subsystems to use inclusive terminology. DSA has been making extensive use of the "master" and "slave" words which are now replaced by "conduit" and "user" respectively.
Changes in v2:
- addressed kbuild test robots reports - preserve capitalization where relevant - fixed build error in mtk_ppe_offload.c
Florian Fainelli (2): net: dsa: Use conduit and user terms net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT
.../bindings/net/dsa/mediatek,mt7530.yaml | 2 +- Documentation/networking/dsa/b53.rst | 14 +- Documentation/networking/dsa/bcm_sf2.rst | 2 +- .../networking/dsa/configuration.rst | 106 +- Documentation/networking/dsa/dsa.rst | 152 +- Documentation/networking/dsa/lan9303.rst | 2 +- Documentation/networking/dsa/sja1105.rst | 8 +- .../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 | 62 +- drivers/net/dsa/ocelot/felix.h | 4 +- drivers/net/dsa/qca/qca8k-8xxx.c | 48 +- 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 | 54 +- include/net/dsa_stubs.h | 10 +- include/uapi/linux/if_link.h | 4 +- net/core/dev_ioctl.c | 2 +- net/dsa/Makefile | 4 +- net/dsa/{master.c => conduit.c} | 96 +- net/dsa/conduit.h | 22 + net/dsa/dsa.c | 218 +-- net/dsa/dsa.h | 10 +- net/dsa/master.h | 22 - net/dsa/netlink.c | 22 +- net/dsa/port.c | 114 +- net/dsa/port.h | 2 +- net/dsa/slave.h | 69 - net/dsa/switch.c | 18 +- net/dsa/switch.h | 4 +- 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 | 4 +- 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} | 1240 ++++++++--------- net/dsa/user.h | 69 + 74 files changed, 1395 insertions(+), 1393 deletions(-) rename net/dsa/{master.c => conduit.c} (79%) 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} (67%) create mode 100644 net/dsa/user.h
-- 2.34.1
[unhandled content-type:application/pkcs7-signature] | |