ath11k: reset RSN/WPA present state for open BSS
authorKarthikeyan Kathirvel <kathirve@codeaurora.org>
Mon, 15 Nov 2021 10:04:41 +0000 (11:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:03:12 +0000 (11:03 +0100)
[ Upstream commit 64bc3aa02ae78b1fcb1b850e0eb1f0622002bfaa ]

The ath11k driver is caching the information about RSN/WPA IE in the
configured beacon template. The cached information is used during
associations to figure out whether 4-way PKT/2-way GTK peer flags need to
be set or not.

But the code never cleared the state when no such IE was found. This can
for example happen when moving from an WPA/RSN to an open setup. The
(seemingly connected) peer was then not able to communicate over the
link because the firmware assumed a different (encryption enabled) state
for the peer.

Tested-on: IPQ6018 hw1.0 AHB WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1

Fixes: 01e34233c645 ("ath11k: fix wmi peer flags in peer assoc command")
Cc: Venkateswara Naralasetty <vnaralas@codeaurora.org>
Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Karthikeyan Kathirvel <kathirve@codeaurora.org>
[sven@narfation.org: split into separate patches, clean up commit message]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211115100441.33771-2-sven@narfation.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath11k/mac.c

index aac10740f5752e02953059b209804cfcd06bffdd..2df60c74809d32fc4343f79f4f0602413bb526ca 100644 (file)
@@ -767,11 +767,15 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif)
 
        if (cfg80211_find_ie(WLAN_EID_RSN, ies, (skb_tail_pointer(bcn) - ies)))
                arvif->rsnie_present = true;
+       else
+               arvif->rsnie_present = false;
 
        if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
                                    WLAN_OUI_TYPE_MICROSOFT_WPA,
                                    ies, (skb_tail_pointer(bcn) - ies)))
                arvif->wpaie_present = true;
+       else
+               arvif->wpaie_present = false;
 
        ret = ath11k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn);