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

Commit a0af5f14 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

mac80211: Fix queuing of scan containing a SSID 



This patch fixes scanning for specific ssid's which is broken due to the
scan being queued up without respecting the ssid to scan for.

Signed-off-by: default avatarHelmut Schaa <hschaa@suse.de>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dbeeb816

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ struct ieee80211_if_sta { 
	u8 bssid[ETH_ALEN], prev_bssid[ETH_ALEN];

	u8 ssid[IEEE80211_MAX_SSID_LEN];

	size_t ssid_len;

	u8 scan_ssid[IEEE80211_MAX_SSID_LEN];

	size_t scan_ssid_len;

	u16 aid;

	u16 ap_capab, capab;

	u8 *extra_ie; /* to be added to the end of AssocReq */

net/mac80211/ieee80211_sta.c

+7 −1
Original line number Diff line number Diff line
@@ -1998,6 +1998,9 @@ void ieee80211_sta_work(struct work_struct *work) 
	if (ifsta->state != IEEE80211_AUTHENTICATE &&

	    ifsta->state != IEEE80211_ASSOCIATE &&

	    test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) {

		if (ifsta->scan_ssid_len)

			ieee80211_sta_start_scan(dev, ifsta->scan_ssid, ifsta->scan_ssid_len);

		else

			ieee80211_sta_start_scan(dev, NULL, 0);

		return;

	}
@@ -2868,6 +2871,9 @@ int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len) 
		return -EBUSY;

	}



	ifsta->scan_ssid_len = ssid_len;

	if (ssid_len)

		memcpy(ifsta->scan_ssid, ssid, ssid_len);

	set_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request);

	queue_work(local->hw.workqueue, &ifsta->work);

	return 0;