Commit 787fe16b authored by Johannes Berg's avatar Johannes Berg
Browse files

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

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



Miri Korenblit says:
====================
iwlwifi fixes
====================

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 1e1f706f f81aa834

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

+4 −4
Original line number Diff line number Diff line
@@ -349,10 +349,6 @@ int iwl_mld_load_fw(struct iwl_mld *mld) 
	if (ret)

		goto err;



	ret = iwl_mld_init_mcc(mld);

	if (ret)

		goto err;



	mld->fw_status.running = true;



	return 0;
@@ -546,6 +542,10 @@ int iwl_mld_start_fw(struct iwl_mld *mld) 
	if (ret)

		goto error;



	ret = iwl_mld_init_mcc(mld);

	if (ret)

		goto error;



	return 0;



error:

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

+2 −1
Original line number Diff line number Diff line
@@ -653,7 +653,8 @@ iwl_mld_nic_error(struct iwl_op_mode *op_mode, 
	 * It might not actually be true that we'll restart, but the

	 * setting doesn't matter if we're going to be unbound either.

	 */

	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT)

	if (type != IWL_ERR_TYPE_RESET_HS_TIMEOUT &&

	    mld->fw_status.running)

		mld->fw_status.in_hw_restart = true;

}

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -6360,8 +6360,8 @@ void iwl_mvm_sync_rx_queues_internal(struct iwl_mvm *mvm, 
			(struct iwl_mvm_internal_rxq_notif *)cmd->payload;

	struct iwl_host_cmd hcmd = {

		.id = WIDE_ID(DATA_PATH_GROUP, TRIGGER_RX_QUEUES_NOTIF_CMD),

		.data[0] = &cmd,

		.len[0] = sizeof(cmd),

		.data[0] = cmd,

		.len[0] = __struct_size(cmd),

		.data[1] = data,

		.len[1] = size,

		.flags = CMD_SEND_IN_RFKILL | (sync ? 0 : CMD_ASYNC),

drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void iwl_trans_pcie_fw_reset_handshake(struct iwl_trans *trans) 
			reset_done =

				inta_hw & MSIX_HW_INT_CAUSES_REG_RESET_DONE;

		} else {

			inta_hw = iwl_read32(trans, CSR_INT_MASK);

			inta_hw = iwl_read32(trans, CSR_INT);

			reset_done = inta_hw & CSR_INT_BIT_RESET_DONE;

		}