wifi: iwlwifi: cfg: restore some 1000 series configs

[ Upstream commit 22e6bdb129ec64e640f5cccef9686f7c1a7d559b ]

In the fixed commit, I inadvertently removed two configurations
while combining the 0x0083/0x0084 device IDs. Replace the fixed
matches for the BG versions by a masked match and add the BGN
version back with a similar masked match.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=220477
Fixes: 1fb053d9876f ("wifi: iwlwifi: cfg: remove unnecessary configs")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250828095500.fabb99c2df9e.If0ad87bf9ab360da5f613e879fd416c17c544733@changeid
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index e4e06bf9161c379db2dc37c510f195ddfcf37c25..b66a581c2e564af5e28d4c2153e395a0e2e97820 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -726,10 +726,10 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                     DEVICE(0x0083), SUBDEV_MASKED(0x5, 0xF)),
        IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
                     DEVICE(0x0083), SUBDEV_MASKED(0x6, 0xF)),
+       IWL_DEV_INFO(iwl1000_bgn_cfg, iwl1000_bgn_name,
+                    DEVICE(0x0084), SUBDEV_MASKED(0x5, 0xF)),
        IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
-                    DEVICE(0x0084), SUBDEV(0x1216)),
-       IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
-                    DEVICE(0x0084), SUBDEV(0x1316)),
+                    DEVICE(0x0084), SUBDEV_MASKED(0x6, 0xF)),
 
 /* 100 Series WiFi */
        IWL_DEV_INFO(iwl100_bgn_cfg, iwl100_bgn_name,