diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 1b25c92ca6..c2fa2addef 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -516,6 +516,8 @@ nm_utils_fixup_product_string(const char *desc) "Network Everywhere", "N Wireless", "N+ Wireless", + "NBase-T/IEEE 802.3an", + "NBase-T/IEEE 802.3bz", "OCT To Fast Ethernet Converter", "PC Card", "PCI Express", @@ -575,6 +577,7 @@ nm_utils_fixup_product_string(const char *desc) "10/100M", "10/20-Gigabit", "10/25/40/50GbE", + "10/25GbE", "10/40G", "10base-FL", "10BaseT", @@ -585,6 +588,7 @@ nm_utils_fixup_product_string(const char *desc) "10Gb/25Gb/40Gb/50Gb", "10Gbase-T", "10GBase-T", + "10GBase-T/NBASE-T", "10GBASE-T", "10GbE", "10Gbps", @@ -600,6 +604,7 @@ nm_utils_fixup_product_string(const char *desc) "16Gbps/10Gbps", "1GbE", "1x2:2", + "2.5GbE", "20GbE", "25Gb", "25GbE", @@ -615,6 +620,8 @@ nm_utils_fixup_product_string(const char *desc) "54Mbps", "56k", "5G", + "5GbE", + "5GBase-T/NBASE-T", "802.11", "802.11a/b/g", "802.11abg", diff --git a/src/libnm-client-impl/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c index b30d02a581..3d49f4a5e3 100644 --- a/src/libnm-client-impl/tests/test-libnm.c +++ b/src/libnm-client-impl/tests/test-libnm.c @@ -694,6 +694,10 @@ test_fixup_product_string(void) T_DATA("Allnet ALL0283 [AR5523]", "Allnet ALL0283"), T_DATA("Allnet ALL0283 [AR5523](no firmware)", "Allnet ALL0283"), T_DATA("Allnet ALL0298 v2 802.11bg", "Allnet ALL0298"), + T_DATA("Alveo X3522, Quad Port, 10/25GbE Adaptable Accelerator Card", + "Alveo X3522 Quad Port Adaptable Accelerator"), + T_DATA("Alveo X3522, Quad Port, 10/25GbE Low Latency Network Adapter", + "Alveo X3522 Quad Port Low Latency"), T_DATA("AM10 v1 802.11n [Ralink RT3072]", "AM10"), T_DATA("AMD-8111 Ethernet", "AMD-8111"), T_DATA("AN2720 USB-USB Bridge", "AN2720 USB-USB Bridge"), @@ -704,6 +708,28 @@ test_fixup_product_string(void) T_DATA("ANA620xx/ANA69011A", "ANA620xx/ANA69011A"), T_DATA("AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242]", "AN-WF500"), T_DATA("Aolynk WUB320g", "Aolynk WUB320g"), + T_DATA("AQtion AQC100 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]", + "AQtion AQC100"), + T_DATA("AQtion AQC100S NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]", + "AQtion AQC100S"), + T_DATA("AQtion AQC107 NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]", + "AQtion AQC107"), + T_DATA("AQtion AQC107S NBase-T/IEEE 802.3an Ethernet Controller [Atlantic 10G]", + "AQtion AQC107S"), + T_DATA("AQC107 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC107"), + T_DATA("AQC108 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC108"), + T_DATA("AQC111 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC111"), + T_DATA("AQC112 NBase-T/IEEE 802.3bz Ethernet Controller [AQtion]", "AQC112"), + T_DATA("AQtion AQC113 NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G]", + "AQtion AQC113"), + T_DATA("AQC113C NBase-T/IEEE 802.3an Ethernet Controller [Marvell Scalable mGig]", + "AQC113C"), + T_DATA("AQtion AQC113CS NBase-T/IEEE 802.3an Ethernet Controller [Antigua 10G]", + "AQtion AQC113CS"), + T_DATA("AQtion AQC114CS NBase-T/IEEE 802.3bz Ethernet Controller [Antigua 5G]", + "AQtion AQC114CS"), + T_DATA("AQtion AQC115C NBase-T/IEEE 802.3bz Ethernet Controller [Antigua 2.5G]", + "AQtion AQC115C"), T_DATA("AR2413/AR2414 Wireless Network Adapter [AR5005G(S) 802.11bg]", "AR2413/AR2414"), T_DATA("AR2417 Wireless Network Adapter [AR5007G 802.11bg]", "AR2417"), T_DATA("AR2425 Wireless Network Adapter [AR5007EG 802.11bg]", "AR2425"), @@ -1684,6 +1710,9 @@ test_fixup_product_string(void) T_DATA("RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller", "RTL8101/2/6E"), T_DATA("RTL-8110SC/8169SC Gigabit Ethernet", "RTL-8110SC/8169SC"), T_DATA("RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller", "RTL8111/8168/8411"), + T_DATA("RTL8125 2.5GbE Controller", "RTL8125"), + T_DATA("RTL8126 5GbE Controller", "RTL8126"), + T_DATA("RTL8127 10GbE Controller", "RTL8127"), T_DATA("RTL-8129", "RTL-8129"), T_DATA("RTL8139D [Realtek] PCI 10/100BaseTX ethernet adaptor", "RTL8139D"), T_DATA("RTL8139 Ethernet", "RTL8139"), @@ -1994,6 +2023,9 @@ test_fixup_product_string(void) "TEW-648UBM"), T_DATA("TG54USB 802.11bg", "TG54USB"), T_DATA("Thomson TG121N [Atheros AR9001U-(2)NG]", "Thomson TG121N"), + T_DATA("TN9510 10GBase-T/NBASE-T Ethernet Adapter", "TN9510"), + T_DATA("TN9710P 10GBase-T/NBASE-T Ethernet Adapter", "TN9710P"), + T_DATA("TN9710Q 5GBase-T/NBASE-T Ethernet Adapter", "TN9710Q"), T_DATA("Top Global Gobi 2000 Wireless Modem", "Top Global Gobi 2000"), T_DATA("TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271]", "TP-Link TL-WN322G / TL-WN422G"),