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

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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

parents f69727fd 5a3e9f7f

drivers/net/wireless/iwlwifi/iwl-6000.c

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6035_2agn_sff_cfg = {

	.name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",

	IWL_DEVICE_6035,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl1030_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",

	IWL_DEVICE_6030,

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

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg; 
extern const struct iwl_cfg iwl2000_2bgn_d_cfg;

extern const struct iwl_cfg iwl2030_2bgn_cfg;

extern const struct iwl_cfg iwl6035_2agn_cfg;

extern const struct iwl_cfg iwl6035_2agn_sff_cfg;

extern const struct iwl_cfg iwl105_bgn_cfg;

extern const struct iwl_cfg iwl105_bgn_d_cfg;

extern const struct iwl_cfg iwl135_bgn_cfg;

drivers/net/wireless/iwlwifi/iwl-trans.h

+4 −2
Original line number Diff line number Diff line
@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans, 
{

	int ret;



	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,

		  "%s bad state = %d", __func__, trans->state);

	if (trans->state != IWL_TRANS_FW_ALIVE) {

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

		return -EIO;

	}



	if (!(cmd->flags & CMD_ASYNC))

		lock_map_acquire_read(&trans->sync_cmd_lockdep_map);

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

+4 −1
Original line number Diff line number Diff line
@@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
		if (!mvmvif->queue_params[ac].uapsd)

			continue;



		cmd->flags |= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);

		if (mvm->cur_ucode != IWL_UCODE_WOWLAN)

			cmd->flags |=

				cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);



		cmd->uapsd_ac_flags |= BIT(ac);



		/* QNDP TID - the highest TID with no admission control */

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

+11 −1
Original line number Diff line number Diff line
@@ -394,6 +394,11 @@ static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait, 
			return false;

		}



		/*

		 * If scan cannot be aborted, it means that we had a

		 * SCAN_COMPLETE_NOTIFICATION in the pipe and it called

		 * ieee80211_scan_completed already.

		 */

		IWL_DEBUG_SCAN(mvm, "Scan cannot be aborted, exit now: %d\n",

			       *resp);

		return true;
@@ -417,14 +422,19 @@ void iwl_mvm_cancel_scan(struct iwl_mvm *mvm) 
					       SCAN_COMPLETE_NOTIFICATION };

	int ret;



	if (mvm->scan_status == IWL_MVM_SCAN_NONE)

		return;



	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_abort,

				   scan_abort_notif,

				   ARRAY_SIZE(scan_abort_notif),

				   iwl_mvm_scan_abort_notif, NULL);



	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD, CMD_SYNC, 0, NULL);

	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_CMD,

				   CMD_SYNC | CMD_SEND_IN_RFKILL, 0, NULL);

	if (ret) {

		IWL_ERR(mvm, "Couldn't send SCAN_ABORT_CMD: %d\n", ret);

		/* mac80211's state will be cleaned in the fw_restart flow */

		goto out_remove_notif;

	}