Commit 68dd8eeb authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge tag 'iwlwifi-fixes-2025-06-18' of... 

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



Miri Korenblit says:
====================
fixes for 6.16-rc3
====================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 05ced11a 83f3ac28

drivers/net/wireless/intel/iwlwifi/dvm/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1316,6 +1316,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, 
		     sizeof(trans->conf.no_reclaim_cmds));

	memcpy(trans->conf.no_reclaim_cmds, no_reclaim_cmds,

	       sizeof(no_reclaim_cmds));

	trans->conf.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);



	switch (iwlwifi_mod_params.amsdu_size) {

	case IWL_AMSDU_DEF:

drivers/net/wireless/intel/iwlwifi/mld/mld.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ void iwl_construct_mld(struct iwl_mld *mld, struct iwl_trans *trans, 


	/* Setup async RX handling */

	spin_lock_init(&mld->async_handlers_lock);

	INIT_LIST_HEAD(&mld->async_handlers_list);

	wiphy_work_init(&mld->async_handlers_wk,

			iwl_mld_async_handlers_wk);

drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void iwl_mvm_mld_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
					    WIDE_ID(MAC_CONF_GROUP,

						    MAC_CONFIG_CMD), 0);



	if (WARN_ON(cmd_ver < 1 && cmd_ver > 3))

	if (WARN_ON(cmd_ver < 1 || cmd_ver > 3))

		return;



	cmd->id_and_color = cpu_to_le32(mvmvif->id);

drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c

+6 −5
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_context_info *ctxt_info;

	struct iwl_context_info_rbd_cfg *rx_cfg;

	u32 control_flags = 0, rb_size;

	u32 control_flags = 0, rb_size, cb_size;

	dma_addr_t phys;

	int ret;
@@ -202,11 +202,12 @@ int iwl_pcie_ctxt_info_init(struct iwl_trans *trans, 
		rb_size = IWL_CTXT_INFO_RB_SIZE_4K;

	}



	WARN_ON(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)) > 12);

	cb_size = RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans));

	if (WARN_ON(cb_size > 12))

		cb_size = 12;



	control_flags = IWL_CTXT_INFO_TFD_FORMAT_LONG;

	control_flags |=

		u32_encode_bits(RX_QUEUE_CB_SIZE(iwl_trans_get_num_rbds(trans)),

				IWL_CTXT_INFO_RB_CB_SIZE);

	control_flags |= u32_encode_bits(cb_size, IWL_CTXT_INFO_RB_CB_SIZE);

	control_flags |= u32_encode_bits(rb_size, IWL_CTXT_INFO_RB_SIZE);

	ctxt_info->control.control_flags = cpu_to_le32(control_flags);