Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d828ad7 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'iwlwifi-for-john-2014-11-10' of... 

Merge tag 'iwlwifi-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes



Emmanuel Grumbach <egrumbach@gmail.com> says:

"Two fixes here - we weren't updating mac80211 if a scan
was cut short by RFKILL which confused cfg80211. As a
result, the latter wouldn't allow to run another scan.
Liad fixes a small bug in the firmware dump."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 9c3a6670 87dd634a

drivers/net/wireless/iwlwifi/mvm/scan.c

+10 −10
Original line number Diff line number Diff line
@@ -602,16 +602,6 @@ static int iwl_mvm_cancel_regular_scan(struct iwl_mvm *mvm) 
					       SCAN_COMPLETE_NOTIFICATION };

	int ret;



	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return 0;



	if (iwl_mvm_is_radio_killed(mvm)) {

		ieee80211_scan_completed(mvm->hw, true);

		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);

		mvm->scan_status = IWL_MVM_SCAN_NONE;

		return 0;

	}



	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,

				   scan_abort_notif,

				   ARRAY_SIZE(scan_abort_notif),
@@ -1400,6 +1390,16 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm, 


int iwl_mvm_cancel_scan(struct iwl_mvm *mvm)

{

	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return 0;



	if (iwl_mvm_is_radio_killed(mvm)) {

		ieee80211_scan_completed(mvm->hw, true);

		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);

		mvm->scan_status = IWL_MVM_SCAN_NONE;

		return 0;

	}



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)

		return iwl_mvm_scan_offload_stop(mvm, true);

	return iwl_mvm_cancel_regular_scan(mvm);

drivers/net/wireless/iwlwifi/pcie/trans.c

+1 −2
Original line number Diff line number Diff line
@@ -1894,8 +1894,7 @@ static u32 iwl_trans_pcie_dump_prph(struct iwl_trans *trans, 
		int reg;

		__le32 *val;



		prph_len += sizeof(*data) + sizeof(*prph) +

			num_bytes_in_chunk;

		prph_len += sizeof(**data) + sizeof(*prph) + num_bytes_in_chunk;



		(*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_PRPH);

		(*data)->len = cpu_to_le32(sizeof(*prph) +