aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_sta.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r--net/mac80211/ieee80211_sta.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index fda0e06453e8..fc6a3ff3d902 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -1998,7 +1998,10 @@ void ieee80211_sta_work(struct work_struct *work)
1998 if (ifsta->state != IEEE80211_AUTHENTICATE && 1998 if (ifsta->state != IEEE80211_AUTHENTICATE &&
1999 ifsta->state != IEEE80211_ASSOCIATE && 1999 ifsta->state != IEEE80211_ASSOCIATE &&
2000 test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) { 2000 test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) {
2001 ieee80211_sta_start_scan(dev, NULL, 0); 2001 if (ifsta->scan_ssid_len)
2002 ieee80211_sta_start_scan(dev, ifsta->scan_ssid, ifsta->scan_ssid_len);
2003 else
2004 ieee80211_sta_start_scan(dev, NULL, 0);
2002 return; 2005 return;
2003 } 2006 }
2004 2007
@@ -2868,6 +2871,9 @@ int ieee80211_sta_req_scan(struct net_device *dev, u8 *ssid, size_t ssid_len)
2868 return -EBUSY; 2871 return -EBUSY;
2869 } 2872 }
2870 2873
2874 ifsta->scan_ssid_len = ssid_len;
2875 if (ssid_len)
2876 memcpy(ifsta->scan_ssid, ssid, ssid_len);
2871 set_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request); 2877 set_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request);
2872 queue_work(local->hw.workqueue, &ifsta->work); 2878 queue_work(local->hw.workqueue, &ifsta->work);
2873 return 0; 2879 return 0;