wifi: iwlwifi: fix 130/1030 configs

The 130/1030 devices are really derivatives of 6030,
with some small differences not pertaining to the MAC,
so they must use the 6030 MAC config.

Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220472
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220517
Fixes: 35ac275ebe0c ("wifi: iwlwifi: cfg: finish config split")
Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250909121728.8e4911f12528.I3aa7194012a4b584fbd5ddaa3a77e483280f1de4@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index f9e2095d649050c75c369d487b1379f17241e8a5..7e56e4ff7642954f62d0890fcbeeab76dd683c27 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -124,13 +124,13 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = {
        {IWL_PCI_DEVICE(0x0082, 0x1304, iwl6005_mac_cfg)},/* low 5GHz active */
        {IWL_PCI_DEVICE(0x0082, 0x1305, iwl6005_mac_cfg)},/* high 5GHz active */
 
-/* 6x30 Series */
-       {IWL_PCI_DEVICE(0x008A, 0x5305, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x008A, 0x5307, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x008A, 0x5325, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x008A, 0x5327, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x008B, 0x5315, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x008B, 0x5317, iwl1000_mac_cfg)},
+/* 1030/6x30 Series */
+       {IWL_PCI_DEVICE(0x008A, 0x5305, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x008A, 0x5307, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x008A, 0x5325, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x008A, 0x5327, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x008B, 0x5315, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x008B, 0x5317, iwl6030_mac_cfg)},
        {IWL_PCI_DEVICE(0x0090, 0x5211, iwl6030_mac_cfg)},
        {IWL_PCI_DEVICE(0x0090, 0x5215, iwl6030_mac_cfg)},
        {IWL_PCI_DEVICE(0x0090, 0x5216, iwl6030_mac_cfg)},
@@ -181,12 +181,12 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct pci_device_id iwl_hw_card_ids[] = {
        {IWL_PCI_DEVICE(0x08AE, 0x1027, iwl1000_mac_cfg)},
 
 /* 130 Series WiFi */
-       {IWL_PCI_DEVICE(0x0896, 0x5005, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x0896, 0x5007, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x0897, 0x5015, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x0897, 0x5017, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x0896, 0x5025, iwl1000_mac_cfg)},
-       {IWL_PCI_DEVICE(0x0896, 0x5027, iwl1000_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0896, 0x5005, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0896, 0x5007, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0897, 0x5015, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0897, 0x5017, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0896, 0x5025, iwl6030_mac_cfg)},
+       {IWL_PCI_DEVICE(0x0896, 0x5027, iwl6030_mac_cfg)},
 
 /* 2x00 Series */
        {IWL_PCI_DEVICE(0x0890, 0x4022, iwl2000_mac_cfg)},