The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8cbe0dd5097fbcbfbfbba50b016ec48352892ca7
commit 8cbe0dd5097fbcbfbfbba50b016ec48352892ca7 Author: ykla <[email protected]> AuthorDate: 2025-11-26 09:02:25 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2025-11-27 06:19:26 +0000 sys: RealTek -> Realtek Realtek changed how it styled its name 25 or so years ago, but the old style persisted in many places. These products use the new styling in their datasheets. Signed-off-by: ykla [email protected] Sponsored by: Chinese FreeBSD Community Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1901 --- sys/amd64/conf/GENERIC | 4 ++-- sys/arm/conf/GENERIC | 2 +- sys/arm/conf/TEGRA124 | 4 ++-- sys/arm64/conf/std.nvidia | 2 +- sys/arm64/iommu/smmu_quirks.c | 2 +- sys/dev/ale/if_ale.c | 2 +- sys/dev/mii/miidevs | 8 ++++---- sys/dev/mii/rgephy.c | 6 +++--- sys/dev/mii/rgephyreg.h | 2 +- sys/dev/mii/rlphy.c | 18 +++++++++--------- sys/dev/mii/rlswitch.c | 2 +- sys/dev/re/if_re.c | 36 ++++++++++++++++++------------------ sys/dev/rl/if_rl.c | 32 ++++++++++++++++---------------- sys/dev/rl/if_rlreg.h | 10 +++++----- sys/dev/usb/net/if_axe.c | 2 +- sys/dev/usb/net/if_rue.c | 2 +- sys/dev/usb/net/ruephy.c | 8 ++++---- sys/i386/conf/GENERIC | 4 ++-- sys/powerpc/conf/GENERIC64 | 4 ++-- sys/powerpc/conf/GENERIC64LE | 4 ++-- 20 files changed, 77 insertions(+), 77 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 4e710e47fdae..ef7ce215474e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -271,8 +271,8 @@ device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # nVidia nForce MCP on-board Ethernet device nge # NatSemi DP83820 gigabit Ethernet -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 +device re # Realtek 8139C+/8169/8169S/8110S +device rl # Realtek 8129/8139 device sge # Silicon Integrated Systems SiS190/191 device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index 89841947713d..b0a2eb92554b 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -100,7 +100,7 @@ device pci device pci_host_generic # PCI NICs -device re # RealTek 8139C+/8169/8169S/8110S +device re # Realtek 8139C+/8169/8169S/8110S # VirtIO device virtio diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index ff23e63f77bd..86462841f24e 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -98,7 +98,7 @@ device ums # USB mouse #device cdce # Generic USB over Ethernet #device cue # CATC USB Ethernet #device kue # Kawasaki LSI USB Ethernet -#device rue # RealTek RTL8150 USB Ethernet +#device rue # Realtek RTL8150 USB Ethernet #device udav # Davicom DM9601E USB # USB Wireless @@ -117,7 +117,7 @@ device pci # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device re # RealTek 8139C+/8169/8169S/8110S +device re # Realtek 8139C+/8169/8169S/8110S # DRM2 device fbd diff --git a/sys/arm64/conf/std.nvidia b/sys/arm64/conf/std.nvidia index fa12fdf8b90d..907da1c8c38c 100644 --- a/sys/arm64/conf/std.nvidia +++ b/sys/arm64/conf/std.nvidia @@ -10,7 +10,7 @@ device uart_ns8250 # ns8250-type UART driver device uart_snps # Ethernet NICs -device re # RealTek 8139C+/8169/8169S/8110S +device re # Realtek 8139C+/8169/8169S/8110S # USB support device tegra210_xusb_fw # Tegra XUSB firmware diff --git a/sys/arm64/iommu/smmu_quirks.c b/sys/arm64/iommu/smmu_quirks.c index 8e8e9ab28c9f..a63f3571fd69 100644 --- a/sys/arm64/iommu/smmu_quirks.c +++ b/sys/arm64/iommu/smmu_quirks.c @@ -56,7 +56,7 @@ struct smmu_quirk_entry { /* List of events that are known and will be silenced. */ static const struct smmu_quirk_entry smmu_quirk_table[] = { - { 0x10ec, 0x8168, "RealTek 8168/8111", 0x10 /* F_TRANSLATION */, 0x0 }, + { 0x10ec, 0x8168, "Realtek 8168/8111", 0x10 /* F_TRANSLATION */, 0x0 }, { 0, 0, NULL, 0, 0 }, }; diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c index 09e0820d2c74..0c84575d6754 100644 --- a/sys/dev/ale/if_ale.c +++ b/sys/dev/ale/if_ale.c @@ -2452,7 +2452,7 @@ ale_rxeof(struct ale_softc *sc, int count) * reproduce this and I doubt it could be related * with FIFO overflow of hardware or activity of Tx * CMB updates. I also remember similar behaviour - * seen on RealTek 8139 which uses resembling Rx + * seen on Realtek 8139 which uses resembling Rx * scheme. */ if (bootverbose) diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 5c10fd0f0224..ca7e78a1cdd5 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -69,7 +69,7 @@ oui NATSEMI 0x080017 National Semiconductor oui PMCSIERRA 0x00e004 PMC-Sierra oui QUALSEMI 0x006051 Quality Semiconductor oui RDC 0x00d02d RDC Semiconductor -oui REALTEK 0x00e04c RealTek Semicondctor +oui REALTEK 0x00e04c Realtek Semicondctor oui SEEQ 0x00a07d Seeq Technology oui SIS 0x00e006 Silicon Integrated Systems oui SMC 0x00800f SMC @@ -109,8 +109,8 @@ oui yyDAVICOM 0x000602 Davicom Semiconductor oui xxICPLUS 0x0009c3 IC Plus Corp. oui xxPMCSIERRA 0x0009c0 PMC-Sierra oui xxPMCSIERRA2 0x009057 PMC-Sierra -oui xxREALTEK 0x000732 RealTek Semicondctor -oui yyREALTEK 0x000004 RealTek Semicondctor +oui xxREALTEK 0x000732 Realtek Semicondctor +oui yyREALTEK 0x000004 Realtek Semicondctor oui xxTI 0x100014 Texas Instruments /* @@ -325,7 +325,7 @@ model xxQUALSEMI QS6612 0x0000 QS6612 10/100 media interface model RDC R6040 0x0003 R6040 10/100 media interface model RDC R6040_2 0x0005 R6040 10/100 media interface -/* RealTek Semicondctor PHYs */ +/* Realtek Semicondctor PHYs */ model yyREALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface model REALTEK RTL8305SC 0x0005 RTL8305SC 10/100 802.1q switch diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c index 4ff86c8c8ccb..32559517680a 100644 --- a/sys/dev/mii/rgephy.c +++ b/sys/dev/mii/rgephy.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> /* - * Driver for the RealTek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY. + * Driver for the Realtek 8169S/8110S/8211B/8211C internal 10/100/1000 PHY. */ #include <sys/param.h> @@ -263,7 +263,7 @@ setit: /* * Callback if something changed. Note that we need to poke - * the DSP on the RealTek PHYs if the media changes. + * the DSP on the Realtek PHYs if the media changes. * */ if (sc->mii_media_active != mii->mii_media_active || @@ -459,7 +459,7 @@ rgephy_loop(struct mii_softc *sc) PHY_WRITE(x, y, (PHY_READ(x, y) & ~(z))) /* - * Initialize RealTek PHY per the datasheet. The DSP in the PHYs of + * Initialize Realtek PHY per the datasheet. The DSP in the PHYs of * existing revisions of the 8169S/8110S chips need to be tuned in * order to reliably negotiate a 1000Mbps link. This is only needed * for rev 0 and rev 1 of the PHY. Later versions work without diff --git a/sys/dev/mii/rgephyreg.h b/sys/dev/mii/rgephyreg.h index fef985ebe30e..89a862734f33 100644 --- a/sys/dev/mii/rgephyreg.h +++ b/sys/dev/mii/rgephyreg.h @@ -41,7 +41,7 @@ #define RGEPHY_8211FVD 8 /* - * RealTek 8169S/8110S gigE PHY registers + * Realtek 8169S/8110S gigE PHY registers */ #define RGEPHY_MII_BMCR 0x00 diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 71b9dc63f839..094fff438a56 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> /* - * driver for RealTek 8139 internal PHYs + * driver for Realtek 8139 internal PHYs */ #include <sys/param.h> @@ -82,11 +82,11 @@ static int rlphy_service(struct mii_softc *, struct mii_data *, int); static void rlphy_status(struct mii_softc *); /* - * RealTek internal PHYs don't have vendor/device ID registers; + * Realtek internal PHYs don't have vendor/device ID registers; * re(4) and rl(4) fake up a return value of all zeros. */ static const struct mii_phydesc rlintphys[] = { - { 0, 0, "RealTek internal media interface" }, + { 0, 0, "Realtek internal media interface" }, MII_PHY_END }; @@ -122,7 +122,7 @@ rlphy_attach(device_t dev) { /* - * The RealTek PHY can never be isolated. + * The Realtek PHY can never be isolated. */ mii_phy_dev_attach(dev, MIIF_NOISOLATE | MIIF_NOMANPAUSE, &rlphy_funcs, 1); @@ -143,7 +143,7 @@ rlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) case MII_TICK: /* - * The RealTek PHY's autonegotiation doesn't need to be + * The Realtek PHY's autonegotiation doesn't need to be * kicked; it continues in the background. */ break; @@ -222,20 +222,20 @@ rlphy_status(struct mii_softc *phy) */ /* - * The RealTek PHY supports non-NWAY link speed + * The Realtek PHY supports non-NWAY link speed * detection, however it does not report the link * detection results via the ANLPAR or BMSR registers. - * (What? RealTek doesn't do things the way everyone + * (What? Realtek doesn't do things the way everyone * else does? I'm just shocked, shocked I tell you.) * To determine the link speed, we have to do one * of two things: * - * - If this is a standalone RealTek RTL8201(L) or + * - If this is a standalone Realtek RTL8201(L) or * workalike PHY, we can determine the link speed by * testing bit 0 in the magic, vendor-specific register * at offset 0x19. * - * - If this is a RealTek MAC with integrated PHY, we + * - If this is a Realtek MAC with integrated PHY, we * can test the 'SPEED10' bit of the MAC's media status * register. */ diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c index 653751df0f4c..fad2aaa64d4c 100644 --- a/sys/dev/mii/rlswitch.c +++ b/sys/dev/mii/rlswitch.c @@ -35,7 +35,7 @@ #include <sys/cdefs.h> /* - * driver for RealTek 8305 pseudo PHYs + * driver for Realtek 8305 pseudo PHYs */ #include <sys/param.h> diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index d56c975a43d2..50e7e1cad16c 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> /* - * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver + * Realtek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver * * Written by Bill Paul <[email protected]> * Senior Networking Software Engineer @@ -42,7 +42,7 @@ */ /* - * This driver is designed to support RealTek's next generation of + * This driver is designed to support Realtek's next generation of * 10/100 and 10/100/1000 PCI ethernet controllers. There are currently * seven devices in this family: the RTL8139C+, the RTL8169, the RTL8169S, * RTL8110S, the RTL8168, the RTL8111 and the RTL8101E. @@ -97,7 +97,7 @@ * (the 'S' stands for 'single-chip'). These devices have the same * programming API as the older 8169, but also have some vendor-specific * registers for the on-board PHY. The 8110S is a LAN-on-motherboard - * part designed to be pin-compatible with the RealTek 8100 10/100 chip. + * part designed to be pin-compatible with the Realtek 8100 10/100 chip. * * This driver takes advantage of the RX and TX checksum offload and * VLAN tag insertion/extraction features. It also implements TX @@ -179,21 +179,21 @@ static const struct rl_type re_devs[] = { { DLINK_VENDORID, DLINK_DEVICEID_530T_REVC, 0, "D-Link DGE-530(T) Gigabit Ethernet Adapter" }, { RT_VENDORID, RT_DEVICEID_2600, 0, - "RealTek Killer E2600 Gigabit Ethernet Controller" }, + "Realtek Killer E2600 Gigabit Ethernet Controller" }, { RT_VENDORID, RT_DEVICEID_8139, 0, - "RealTek 8139C+ 10/100BaseTX" }, + "Realtek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, 0, - "RealTek 810xE PCIe 10/100baseTX" }, + "Realtek 810xE PCIe 10/100baseTX" }, { RT_VENDORID, RT_DEVICEID_8168, 0, - "RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet" }, + "Realtek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8161, 0, - "RealTek 8168 Gigabit Ethernet" }, + "Realtek 8168 Gigabit Ethernet" }, { NCUBE_VENDORID, RT_DEVICEID_8168, 0, "TP-Link TG-3468 v2 (RTL8168) Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169, 0, - "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" }, + "Realtek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" }, { RT_VENDORID, RT_DEVICEID_8169SC, 0, - "RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" }, + "Realtek 8169SC/8110SC Single-chip Gigabit Ethernet" }, { COREGA_VENDORID, COREGA_DEVICEID_CGLAPCIGT, 0, "Corega CG-LAPCIGT (RTL8169S) Gigabit Ethernet" }, { LINKSYS_VENDORID, LINKSYS_DEVICEID_EG1032, 0, @@ -647,7 +647,7 @@ re_miibus_statchg(device_t dev) } } /* - * RealTek controllers do not provide any interface to the RX/TX + * Realtek controllers do not provide any interface to the RX/TX * MACs for resolved speed, duplex and flow-control parameters. */ } @@ -703,7 +703,7 @@ re_set_rxmode(struct rl_softc *sc) if (hashes[0] != 0 || hashes[1] != 0) { /* - * For some unfathomable reason, RealTek decided to + * For some unfathomable reason, Realtek decided to * reverse the order of the multicast hash registers * in the PCI Express parts. This means we have to * write the hash pattern in reverse order for those @@ -932,7 +932,7 @@ done: #endif /* - * Probe for a RealTek 8139C+/8169/8110 chip. Check the PCI vendor and device + * Probe for a Realtek 8139C+/8169/8110 chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ static int @@ -1007,9 +1007,9 @@ re_allocmem(device_t dev, struct rl_softc *sc) /* * Allocate the parent bus DMA tag appropriate for PCI. * In order to use DAC, RL_CPLUSCMD_PCI_DAC bit of RL_CPLUS_CMD - * register should be set. However some RealTek chips are known + * register should be set. However some Realtek chips are known * to be buggy on DAC handling, therefore disable DAC by limiting - * DMA address space to 32bit. PCIe variants of RealTek chips + * DMA address space to 32bit. PCIe variants of Realtek chips * may not have the limitation. */ lowaddr = BUS_SPACE_MAXADDR; @@ -1957,7 +1957,7 @@ re_newbuf(struct rl_softc *sc, int idx) #ifdef RE_FIXUP_RX /* * This is part of an evil trick to deal with non-x86 platforms. - * The RealTek chip requires RX buffers to be aligned on 64-bit + * The Realtek chip requires RX buffers to be aligned on 64-bit * boundaries, but that will hose non-x86 machines. To get around * this, we leave some empty space at the start of each buffer * and for non-x86 hosts, we copy the buffer back six bytes @@ -2242,7 +2242,7 @@ re_rxeof(struct rl_softc *sc, int *rx_npktsp) * it is 13 bits (since the max RX frame length is 16K). * Unfortunately, all 32 bits in the status word * were already used, so to make room for the extra - * length bit, RealTek took out the 'frame alignment + * length bit, Realtek took out the 'frame alignment * error' bit and shifted the other status bits * over one slot. The OWN, EOR, FS and LS bits are * still in the same places. We have already extracted @@ -2742,7 +2742,7 @@ re_encap(struct rl_softc *sc, struct mbuf **m_head) M_ASSERTPKTHDR((*m_head)); /* - * With some of the RealTek chips, using the checksum offload + * With some of the Realtek chips, using the checksum offload * support in conjunction with the autopadding feature results * in the transmission of corrupt frames. For example, if we * need to send a really small IP fragment that's less than 60 diff --git a/sys/dev/rl/if_rl.c b/sys/dev/rl/if_rl.c index c045e57fb79a..09ed88cd6d82 100644 --- a/sys/dev/rl/if_rl.c +++ b/sys/dev/rl/if_rl.c @@ -32,10 +32,10 @@ #include <sys/cdefs.h> /* - * RealTek 8129/8139 PCI NIC driver + * Realtek 8129/8139 PCI NIC driver * * Supports several extremely cheap PCI 10/100 adapters based on - * the RealTek chipset. Datasheets can be obtained from + * the Realtek chipset. Datasheets can be obtained from * www.realtek.com.tw. * * Written by Bill Paul <[email protected]> @@ -43,7 +43,7 @@ * Columbia University, New York City */ /* - * The RealTek 8139 PCI NIC redefines the meaning of 'low end.' This is + * The Realtek 8139 PCI NIC redefines the meaning of 'low end.' This is * probably the worst PCI ethernet controller ever made, with the possible * exception of the FEAST chip made by SMC. The 8139 supports bus-master * DMA, but it has a terrible interface that nullifies any performance @@ -132,15 +132,15 @@ MODULE_DEPEND(rl, miibus, 1, 1, 1); */ static const struct rl_type rl_devs[] = { { RT_VENDORID, RT_DEVICEID_8129, RL_8129, - "RealTek 8129 10/100BaseTX" }, + "Realtek 8129 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139, RL_8139, - "RealTek 8139 10/100BaseTX" }, + "Realtek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8139D, RL_8139, - "RealTek 8139 10/100BaseTX" }, + "Realtek 8139 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8138, RL_8139, - "RealTek 8139 10/100BaseTX CardBus" }, + "Realtek 8139 10/100BaseTX CardBus" }, { RT_VENDORID, RT_DEVICEID_8100, RL_8139, - "RealTek 8100 10/100BaseTX" }, + "Realtek 8100 10/100BaseTX" }, { ACCTON_VENDORID, ACCTON_DEVICEID_5030, RL_8139, "Accton MPX 5030/5038 10/100BaseTX" }, { DELTA_VENDORID, DELTA_DEVICEID_8139, RL_8139, @@ -499,7 +499,7 @@ rl_miibus_statchg(device_t dev) } } /* - * RealTek controllers do not provide any interface to + * Realtek controllers do not provide any interface to * Tx/Rx MACs for resolved speed, duplex and flow-control * parameters. */ @@ -577,7 +577,7 @@ rl_reset(struct rl_softc *sc) } /* - * Probe for a RealTek 8129/8139 chip. Check the PCI vendor and device + * Probe for a Realtek 8129/8139 chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ static int @@ -669,7 +669,7 @@ rl_attach(device_t dev) * there appear to be problems with memory mapped mode: it looks * like doing too many memory mapped access back to back in rapid * succession can hang the bus. I'm inclined to blame this on - * crummy design/construction on the part of RealTek. Memory + * crummy design/construction on the part of Realtek. Memory * mapped mode does appear to work on uniprocessor systems though. */ prefer_iomap = 1; @@ -1143,11 +1143,11 @@ rl_rxeof(struct rl_softc *sc) /* * Here's a totally undocumented fact for you. When the - * RealTek chip is in the process of copying a packet into + * Realtek chip is in the process of copying a packet into * RAM for you, the length will be 0xfff0. If you spot a * packet header with this value, you need to stop. The * datasheet makes absolutely no mention of this and - * RealTek should be shot for this. + * Realtek should be shot for this. */ total_len = rxstat >> 16; if (total_len == RL_RXSTAT_UNFINISHED) @@ -1166,7 +1166,7 @@ rl_rxeof(struct rl_softc *sc) rx_bytes += total_len + 4; /* - * XXX The RealTek chip includes the CRC with every + * XXX The Realtek chip includes the CRC with every * received frame, and there's no way to turn this * behavior off (at least, I can't find anything in * the manual that explains how to do it) so we have @@ -1288,7 +1288,7 @@ rl_twister_update(struct rl_softc *sc) { uint16_t linktest; /* - * Table provided by RealTek (Kinston <[email protected]>) for + * Table provided by Realtek (Kinston <[email protected]>) for * Linux driver. Values undocumented otherwise. */ static const uint32_t param[4][4] = { @@ -1551,7 +1551,7 @@ rl_encap(struct rl_softc *sc, struct mbuf **m_head) if (m->m_pkthdr.len < RL_MIN_FRAMELEN) padlen = RL_MIN_FRAMELEN - m->m_pkthdr.len; /* - * The RealTek is brain damaged and wants longword-aligned + * The Realtek is brain damaged and wants longword-aligned * TX buffers, plus we can only have one fragment buffer * per packet. We have to copy pretty much all the time. */ diff --git a/sys/dev/rl/if_rlreg.h b/sys/dev/rl/if_rlreg.h index 6339b12472b6..10e25fcb5373 100644 --- a/sys/dev/rl/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h @@ -31,7 +31,7 @@ */ /* - * RealTek 8129/8139 register offsets + * Realtek 8129/8139 register offsets */ #define RL_IDR0 0x0000 /* ID register 0 (station addr) */ #define RL_IDR1 0x0001 /* Must use 32-bit accesses (?) */ @@ -544,7 +544,7 @@ #define RL_GMEDIASTAT_TBI 0x80 /* TBI enabled */ /* - * The RealTek doesn't use a fragment-based descriptor mechanism. + * The Realtek doesn't use a fragment-based descriptor mechanism. * Instead, there are only four register sets, each of which represents * one 'descriptor.' Basically, each TX descriptor is just a contiguous * packet buffer (32-bit aligned!) and we place the buffer addresses in @@ -801,7 +801,7 @@ struct rl_stats { #define RL_ADDR_HI(y) ((uint64_t) (y) >> 32) /* - * The number of bits reserved for MSS in RealTek controllers is + * The number of bits reserved for MSS in Realtek controllers is * 11bits. This limits the maximum interface MTU size in TSO case * as upper stack should not generate TCP segments with MSS greater * than the limit. @@ -985,12 +985,12 @@ struct rl_softc { /* * General constants that are fun to know. * - * RealTek PCI vendor ID + * Realtek PCI vendor ID */ #define RT_VENDORID 0x10EC /* - * RealTek chip device IDs. + * Realtek chip device IDs. */ #define RT_DEVICEID_2600 0x2600 #define RT_DEVICEID_8139D 0x8039 diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c index 117a3daa170f..38690931c13e 100644 --- a/sys/dev/usb/net/if_axe.c +++ b/sys/dev/usb/net/if_axe.c @@ -49,7 +49,7 @@ /* * The AX88172 provides USB ethernet supports at 10 and 100Mbps. - * It uses an external PHY (reference designs use a RealTek chip), + * It uses an external PHY (reference designs use a Realtek chip), * and has a 64-bit multicast hash filter. There is some information * missing from the manual which one needs to know in order to make * the chip function: diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c index d1b46887cd20..37512d902b4f 100644 --- a/sys/dev/usb/net/if_rue.c +++ b/sys/dev/usb/net/if_rue.c @@ -59,7 +59,7 @@ */ /* - * RealTek RTL8150 USB to fast ethernet controller driver. + * Realtek RTL8150 USB to fast ethernet controller driver. * Datasheet is available from * ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/. */ diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c index 2b5358ab8d0c..8f46fb75c1c5 100644 --- a/sys/dev/usb/net/ruephy.c +++ b/sys/dev/usb/net/ruephy.c @@ -28,7 +28,7 @@ */ /* - * driver for RealTek RTL8150 internal PHY + * driver for Realtek RTL8150 internal PHY */ #include <sys/param.h> @@ -76,11 +76,11 @@ static void ruephy_reset(struct mii_softc *); static void ruephy_status(struct mii_softc *); /* - * The RealTek RTL8150 internal PHY doesn't have vendor/device ID + * The Realtek RTL8150 internal PHY doesn't have vendor/device ID * registers; rue(4) fakes up a return value of all zeros. */ static const struct mii_phydesc ruephys[] = { - { 0, 0, "RealTek RTL8150 internal media interface" }, + { 0, 0, "Realtek RTL8150 internal media interface" }, MII_PHY_END }; @@ -167,7 +167,7 @@ ruephy_reset(struct mii_softc *sc) mii_phy_reset(sc); /* - * XXX RealTek RTL8150 PHY doesn't set the BMCR properly after + * XXX Realtek RTL8150 PHY doesn't set the BMCR properly after * XXX reset, which breaks autonegotiation. */ PHY_WRITE(sc, MII_BMCR, (BMCR_S100 | BMCR_AUTOEN | BMCR_FDX)); diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 06738a7ed506..5162775df8fd 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -232,8 +232,8 @@ device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # nVidia nForce MCP on-board Ethernet device nge # NatSemi DP83820 gigabit Ethernet -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 +device re # Realtek 8139C+/8169/8169S/8110S +device rl # Realtek 8129/8139 device sge # Silicon Integrated Systems SiS190/191 device sis # Silicon Integrated Systems SiS 900/SiS 7016 device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index e215651e4c3d..1c8309fbf3e7 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -180,8 +180,8 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device gem # Sun GEM/Sun ERI/Apple GMAC device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 +device re # Realtek 8139C+/8169/8169S/8110S +device rl # Realtek 8129/8139 # Nvidia/Mellanox Connect-X 4 and later, Ethernet only # mlx5ib requires ibcore infra and is not included by default diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 4759b70a3d1f..d7eb006a08ad 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -176,8 +176,8 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device gem # Sun GEM/Sun ERI/Apple GMAC device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 +device re # Realtek 8139C+/8169/8169S/8110S +device rl # Realtek 8129/8139 # Nvidia/Mellanox Connect-X 4 and later, Ethernet only # mlx5ib requires ibcore infra and is not included by default
