Commit fca7018d authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: iwlwifi: move Bz and Gl iwl_dev_info entries 



The iwl_dev_info entries for these devices were incorrectly positioned
within the array, out of chronological order. Move them arround.

Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Link: https://msgid.link/20240527190228.a75e9a1eb86c.I003980f8ca60a96019657e396e848a07df6b92a4@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5860c6f5

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

+26 −26
Original line number Diff line number Diff line
@@ -997,32 +997,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_CDB,

		      iwlax411_2ax_cfg_so_gf4_a0, iwl_ax411_name),



/* Bz */

/* FIXME: need to change the naming according to the actual CRF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_bz, iwl_fm_name),



	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_bz, iwl_fm_name),



/* Ga (Gl) */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_320, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl, iwl_gl_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_NO_320, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl, iwl_mtp_name),



/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,
@@ -1103,6 +1077,32 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_NO_160, IWL_CFG_CORES_BT, IWL_CFG_NO_CDB,

		      iwlax210_2ax_cfg_so_jf_b0, iwl9462_name),



/* Bz */

/* FIXME: need to change the naming according to the actual CRF */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_bz, iwl_fm_name),



	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ_W, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_bz, iwl_fm_name),



/* Ga (Gl) */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_320, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl, iwl_gl_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_NO_320, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl, iwl_mtp_name),



/* Sc */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,