Commit a0fe8b33 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: simplify scan start 



ieee80211_sta_start_scan() can very well take a non-NULL
ssid pointer with a zero ssid_len.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9116dd01

net/mac80211/mlme.c

+1 −4
Original line number Diff line number Diff line
@@ -3052,10 +3052,7 @@ void ieee80211_sta_work(struct work_struct *work) 
	    ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE &&

	    ifsta->state != IEEE80211_STA_MLME_ASSOCIATE &&

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

		if (ifsta->scan_ssid_len)

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

		else

			ieee80211_sta_start_scan(sdata, NULL, 0);

		return;

	}