Commit 45b4eb7e authored by Kalle Valo's avatar Kalle Valo
Browse files

Revert "ath10k: drop beacon and probe response which leak from other channel" 



This reverts commit 3bf2537e.

I was reported privately that this commit breaks AP and mesh mode on QCA9984
(firmware 10.4-3.9.0.2-00156). So revert the commit to fix the regression.

There was a conflict due to cfg80211 API changes but that was easy to fix.

Fixes: 3bf2537e ("ath10k: drop beacon and probe response which leak from other channel")
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220315155455.20446-1-kvalo@kernel.org
parent e6e91ec9

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

+1 −32
Original line number Diff line number Diff line
@@ -2611,36 +2611,9 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 
		ath10k_mac_handle_beacon(ar, skb);



	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control)) {

		struct ieee80211_mgmt *mgmt = (void *)skb->data;

		enum cfg80211_bss_frame_type ftype;

		u8 *ies;

		int ies_ch;



	    ieee80211_is_probe_resp(hdr->frame_control))

		status->boottime_ns = ktime_get_boottime_ns();



		if (!ar->scan_channel)

			goto drop;



		ies = mgmt->u.beacon.variable;



		if (ieee80211_is_beacon(mgmt->frame_control))

			ftype = CFG80211_BSS_FTYPE_BEACON;

		else

			ftype = CFG80211_BSS_FTYPE_PRESP;



		ies_ch = cfg80211_get_ies_channel_number(mgmt->u.beacon.variable,

							 skb_tail_pointer(skb) - ies,

							 sband->band, ftype);



		if (ies_ch > 0 && ies_ch != channel) {

			ath10k_dbg(ar, ATH10K_DBG_MGMT,

				   "channel mismatched ds channel %d scan channel %d\n",

				   ies_ch, channel);

			goto drop;

		}

	}



	ath10k_dbg(ar, ATH10K_DBG_MGMT,

		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",

		   skb, skb->len,
@@ -2654,10 +2627,6 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 
	ieee80211_rx_ni(ar->hw, skb);



	return 0;



drop:

	dev_kfree_skb(skb);

	return 0;

}



static int freq_to_idx(struct ath10k *ar, int freq)