Commit a814c36c authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-fixes-2025-09-09' of... 

Merge tag 'iwlwifi-fixes-2025-09-09' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next



Miri Korenblit says:
====================
iwlwifi fix
====================

Which is a fix for (old) 130/1030 devices to work again.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents bda60596 2682e7a3

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+13 −13
Original line number Diff line number Diff line
@@ -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)},