Skip to content

Commit 79be735

Browse files
jmberg-intelgregkh
authored andcommitted
wifi: iwlwifi: cfg: restore some 1000 series configs
[ Upstream commit 22e6bdb ] 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: 1fb053d ("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>
1 parent 60c2a80 commit 79be735

File tree

1 file changed

+3
-3
lines changed
  • drivers/net/wireless/intel/iwlwifi/pcie

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,10 +726,10 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
726726
DEVICE(0x0083), SUBDEV_MASKED(0x5, 0xF)),
727727
IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
728728
DEVICE(0x0083), SUBDEV_MASKED(0x6, 0xF)),
729+
IWL_DEV_INFO(iwl1000_bgn_cfg, iwl1000_bgn_name,
730+
DEVICE(0x0084), SUBDEV_MASKED(0x5, 0xF)),
729731
IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
730-
DEVICE(0x0084), SUBDEV(0x1216)),
731-
IWL_DEV_INFO(iwl1000_bg_cfg, iwl1000_bg_name,
732-
DEVICE(0x0084), SUBDEV(0x1316)),
732+
DEVICE(0x0084), SUBDEV_MASKED(0x6, 0xF)),
733733

734734
/* 100 Series WiFi */
735735
IWL_DEV_INFO(iwl100_bgn_cfg, iwl100_bgn_name,

0 commit comments

Comments
 (0)