Commit 1bbdcbae authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2022-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v5.17

Third set of fixes for v5.17. We have only one revert to fix an ath10k
regression.

* tag 'wireless-2022-03-16' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  Revert "ath10k: drop beacon and probe response which leak from other channel"
====================

Link: https://lore.kernel.org/r/20220316130249.B5225C340EC@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dea2d93a 45b4eb7e

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)