iwlwifi: remove support for QnJ Hr STEP A (a661bfac) · Commits · 戴 / test

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -79,7 +79,6 @@
		#define IWL_22000_HR_A_F0_FW_PRE "iwlwifi-QuQnj-f0-hr-a0-"
		#define IWL_22000_QU_B_HR_B_FW_PRE "iwlwifi-Qu-b0-hr-b0-"
		#define IWL_22000_HR_B_FW_PRE "iwlwifi-QuQnj-b0-hr-b0-"
		#define IWL_22000_HR_A0_FW_PRE "iwlwifi-QuQnj-a0-hr-a0-"
		#define IWL_QU_C_HR_B_FW_PRE "iwlwifi-Qu-c0-hr-b0-"
		#define IWL_QU_B_JF_B_FW_PRE "iwlwifi-Qu-b0-jf-b0-"
		#define IWL_QU_C_JF_B_FW_PRE "iwlwifi-Qu-c0-jf-b0-"
		@@ -104,8 +103,6 @@
		IWL_22000_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
		#define IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(api) \
		IWL_22000_HR_B_FW_PRE __stringify(api) ".ucode"
		#define IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(api) \
		IWL_22000_HR_A0_FW_PRE __stringify(api) ".ucode"
		#define IWL_QUZ_A_HR_B_MODULE_FIRMWARE(api) \
		IWL_QUZ_A_HR_B_FW_PRE __stringify(api) ".ucode"
		#define IWL_QUZ_A_JF_B_MODULE_FIRMWARE(api) \
		@@ -531,19 +528,6 @@ const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0 = {
		.num_rbds = IWL_NUM_RBDS_22000_HE,
		};

		const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0 = {
		.name = "Intel(R) Dual Band Wireless AX 22000",
		.fw_name_pre = IWL_22000_HR_A0_FW_PRE,
		IWL_DEVICE_22500,
		/*
		* This device doesn't support receiving BlockAck with a large bitmap
		* so we need to restrict the size of transmitted aggregation to the
		* HT size; mac80211 would otherwise pick the HE max (256) by default.
		*/
		.max_tx_agg_size = IEEE80211_MAX_AMPDU_BUF_HT,
		.num_rbds = IWL_NUM_RBDS_22000_HE,
		};

		const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0 = {
		.name = "Intel(R) Wireless-AC 9560 160MHz",
		.fw_name_pre = IWL_22000_SO_A_JF_B_FW_PRE,
		@@ -594,7 +578,6 @@ MODULE_FIRMWARE(IWL_22000_HR_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_22000_JF_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_22000_HR_A_F0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_22000_HR_B_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_22000_HR_A0_QNJ_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -620,7 +620,6 @@ extern const struct iwl_cfg killer1650w_2ax_cfg;
		extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0_f0;
		extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0_f0;
		extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_b0;
		extern const struct iwl_cfg iwl22000_2ax_cfg_qnj_hr_a0;
		extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_a0;
		extern const struct iwl_cfg iwlax210_2ax_cfg_so_hr_a0;
		extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0;

Admin message