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

Commit 4e5496b8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ath10k: Fix p2p_listen for wcn3990"

parents 03f96df5 d726d7b7

drivers/net/wireless/ath/ath10k/mac.c

+4 −1
Original line number Diff line number Diff line
@@ -6428,6 +6428,9 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 
	arg.dwell_time_passive = scan_time_msec;

	arg.max_scan_time = scan_time_msec;

	arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

	if (QCA_REV_WCN3990(ar))

		arg.scan_ctrl_flags &= ~WMI_SCAN_FILTER_PROBE_REQ;

	else

		arg.scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;

	arg.burst_duration_ms = duration;

drivers/net/wireless/ath/ath10k/wmi-tlv.c

+1 −5
Original line number Diff line number Diff line
@@ -1553,11 +1553,7 @@ ath10k_wmi_tlv_op_gen_start_scan(struct ath10k *ar, 
	cmd->ie_len = __cpu_to_le32(arg->ie_len);

	cmd->num_probes = __cpu_to_le32(3);



	if (QCA_REV_WCN3990(ar)) {

		cmd->common.scan_ctrl_flags = ar->fw_flags->flags;

		cmd->common.scan_ctrl_flags |=

					__cpu_to_le32(WMI_SCAN_CHAN_STAT_EVENT);

	} else {

	if (!QCA_REV_WCN3990(ar)) {

		cmd->common.scan_ctrl_flags ^=

			__cpu_to_le32(WMI_SCAN_FILTER_PROBE_REQ);

	}

drivers/net/wireless/ath/ath10k/wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -6192,6 +6192,8 @@ void ath10k_wmi_start_scan_init(struct ath10k *ar, 
		| WMI_SCAN_EVENT_BSS_CHANNEL

		| WMI_SCAN_EVENT_FOREIGN_CHANNEL

		| WMI_SCAN_EVENT_DEQUEUED;

	if (QCA_REV_WCN3990(ar))

		arg->scan_ctrl_flags = ar->fw_flags->flags;

	arg->scan_ctrl_flags |= WMI_SCAN_CHAN_STAT_EVENT;

	arg->n_bssids = 1;

	arg->bssids[0].bssid = "\xFF\xFF\xFF\xFF\xFF\xFF";