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

Commit 551185ca authored by Jouni Malinen's avatar Jouni Malinen Committed by Kalle Valo
Browse files

ath6kl: Update BSS information after connection 



Since we may end up using a dummy BSS entry when roaming, allow one Beacon
frame -based bssinfo from the current BSS to be processed prior to starting
to filter all bssinfo events. This allows cfg80211 BSS table to be filled
with proper data in the roaming case where the full Beacon data may not
have been present at the time of roamed event.

Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 82e14f56

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −0
Original line number Diff line number Diff line
@@ -360,6 +360,7 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
	}



	if (!ar->usr_bss_filter) {

		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag);

		if (ath6kl_wmi_bssfilter_cmd(ar->wmi, ALL_BSS_FILTER, 0) != 0) {

			ath6kl_err("couldn't set bss filtering\n");

			up(&ar->sem);
@@ -638,6 +639,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, 
		return -EIO;



	if (!ar->usr_bss_filter) {

		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag);

		ret = ath6kl_wmi_bssfilter_cmd(

			ar->wmi,

			(test_bit(CONNECTED, &ar->flag) ?

drivers/net/wireless/ath/ath6kl/core.h

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ struct ath6kl_req_key { 
#define SKIP_SCAN	     11

#define WLAN_ENABLED	     12

#define TESTMODE	     13

#define CLEAR_BSSFILTER_ON_BEACON 14



struct ath6kl {

	struct device *dev;

drivers/net/wireless/ath/ath6kl/main.c

+7 −3
Original line number Diff line number Diff line
@@ -1011,8 +1011,10 @@ void ath6kl_scan_complete_evt(struct ath6kl *ar, int status) 
{

	ath6kl_cfg80211_scan_complete_event(ar, status);



	if (!ar->usr_bss_filter)

	if (!ar->usr_bss_filter) {

		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag);

		ath6kl_wmi_bssfilter_cmd(ar->wmi, NONE_BSS_FILTER, 0);

	}



	ath6kl_dbg(ATH6KL_DBG_WLAN_SCAN, "scan complete: %d\n", status);

}
@@ -1056,8 +1058,10 @@ void ath6kl_connect_event(struct ath6kl *ar, u16 channel, u8 *bssid, 
		ar->next_ep_id = ENDPOINT_2;

	}



	if (!ar->usr_bss_filter)

		ath6kl_wmi_bssfilter_cmd(ar->wmi, NONE_BSS_FILTER, 0);

	if (!ar->usr_bss_filter) {

		set_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag);

		ath6kl_wmi_bssfilter_cmd(ar->wmi, CURRENT_BSS_FILTER, 0);

	}

}



void ath6kl_tkip_micerr_event(struct ath6kl *ar, u8 keyid, bool ismcast)

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

+6 −0
Original line number Diff line number Diff line
@@ -917,6 +917,12 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len) 
	    bih->frame_type != PROBERESP_FTYPE)

		return 0; /* Only update BSS table for now */



	if (bih->frame_type == BEACON_FTYPE &&

	    test_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag)) {

		clear_bit(CLEAR_BSSFILTER_ON_BEACON, &ar->flag);

		ath6kl_wmi_bssfilter_cmd(ar->wmi, NONE_BSS_FILTER, 0);

	}



	channel = ieee80211_get_channel(ar->wdev->wiphy, le16_to_cpu(bih->ch));

	if (channel == NULL)

		return -EINVAL;