From 36b9a699a29048759317731b738b0800d604b5fd Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Wed, 19 Feb 2025 21:09:26 -0500 Subject: [PATCH] wifi-scripts: use consistent names for Qualcomm devices The device manufacturer name for Qualcomm Atheros is listed as "Qualcomm, Atheros" for PCI devices but "Qualcomm Atheros" under "compatible". This gives inconsistent results in `iwinfo` and ``` Hardware: 0x168c:0x0046 0x168c:0xcafe [Qualcomm, Atheros QCA9984] Hardware: embedded [Qualcomm Atheros IPQ8074] ``` Signed-off-by: Sean Khan Link: https://github.com/openwrt/openwrt/pull/18039 Signed-off-by: Robert Marko --- .../files-ucode/usr/share/wifi_devices.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json b/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json index 29dbcef2462..d1331efee60 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/wifi_devices.json @@ -158,19 +158,19 @@ [ "0x168c", "0x0033", "0x19b6", "0xd057", 0, 0, "MikroTik", "R11e-5HnDr2" ], [ "0x168c", "0x0033", "0x19b6", "0xd016", 0, 0, "MikroTik", "R11e-2HPnD" ], [ "0x168c", "0x0034", "0x17aa", "0x3214", 0, 0, "Atheros", "AR9462" ], - [ "0x168c", "0x003c", "0x0000", "0x0000", 0, 0, "Qualcomm, Atheros", "QCA9880" ], - [ "0x168c", "0x003c", "0x168c", "0x3223", 0, 0, "Qualcomm, Atheros", "QCA9880" ], - [ "0x168c", "0x003c", "0x1a56", "0x1420", 0, 0, "Qualcomm, Atheros", "QCA9862" ], + [ "0x168c", "0x003c", "0x0000", "0x0000", 0, 0, "Qualcomm Atheros", "QCA9880" ], + [ "0x168c", "0x003c", "0x168c", "0x3223", 0, 0, "Qualcomm Atheros", "QCA9880" ], + [ "0x168c", "0x003c", "0x1a56", "0x1420", 0, 0, "Qualcomm Atheros", "QCA9862" ], [ "0x168c", "0x003c", "0x19b6", "0xd03c", 0, 0, "Mikrotik", "R11e-5HacT" ], [ "0x168c", "0x003c", "0x19b6", "0xd075", 0, 0, "Mikrotik", "R11e-5HacD" ], - [ "0x168c", "0x003e", "0x168c", "0x3361", 0, 0, "Qualcomm, Atheros", "QCA6174" ], - [ "0x168c", "0x0046", "0x168c", "0xcafe", 0, 0, "Qualcomm, Atheros", "QCA9984" ], - [ "0x168c", "0x0040", "0x168c", "0x0002", 0, 0, "Qualcomm, Atheros", "QCA9990" ], - [ "0x168c", "0x0046", "0x0777", "0xe535", 0, 0, "Qualcomm, Atheros", "QCA9994" ], - [ "0x168c", "0x0046", "0x0777", "0xe5a2", 0, 0, "Qualcomm, Atheros", "QCA9994" ], - [ "0x168c", "0x0050", "0x0000", "0x0000", 0, 0, "Qualcomm, Atheros", "QCA9887" ], - [ "0x168c", "0x0056", "0x0000", "0x0000", 0, 0, "Qualcomm, Atheros", "QCA9886" ], - [ "0x17cb", "0x1104", "0x17cb", "0x1104", 0, 0, "Qualcomm, Atheros", "QCN6024/9024/9074" ], + [ "0x168c", "0x003e", "0x168c", "0x3361", 0, 0, "Qualcomm Atheros", "QCA6174" ], + [ "0x168c", "0x0046", "0x168c", "0xcafe", 0, 0, "Qualcomm Atheros", "QCA9984" ], + [ "0x168c", "0x0040", "0x168c", "0x0002", 0, 0, "Qualcomm Atheros", "QCA9990" ], + [ "0x168c", "0x0046", "0x0777", "0xe535", 0, 0, "Qualcomm Atheros", "QCA9994" ], + [ "0x168c", "0x0046", "0x0777", "0xe5a2", 0, 0, "Qualcomm Atheros", "QCA9994" ], + [ "0x168c", "0x0050", "0x0000", "0x0000", 0, 0, "Qualcomm Atheros", "QCA9887" ], + [ "0x168c", "0x0056", "0x0000", "0x0000", 0, 0, "Qualcomm Atheros", "QCA9886" ], + [ "0x17cb", "0x1104", "0x17cb", "0x1104", 0, 0, "Qualcomm Atheros", "QCN6024/9024/9074" ], [ "0x1814", "0x3051", "0x1814", "0x0007", 0, 0, "Ralink", "Rt3051" ], [ "0x1814", "0x3052", "0x1814", "0x0008", 0, 0, "Ralink", "Rt3052" ], [ "0x1814", "0x3350", "0x1814", "0x000b", 0, 0, "Ralink", "Rt3350" ], -- 2.47.2