aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/wext.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/wext.c')
-rw-r--r--net/mac80211/wext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c
index 97d132811c81..77b68ed8b832 100644
--- a/net/mac80211/wext.c
+++ b/net/mac80211/wext.c
@@ -552,7 +552,7 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
552 ssid_len = req->essid_len; 552 ssid_len = req->essid_len;
553 } 553 }
554 554
555 return ieee80211_sta_req_scan(sdata, ssid, ssid_len); 555 return ieee80211_request_scan(sdata, ssid, ssid_len);
556} 556}
557 557
558 558
@@ -566,10 +566,10 @@ static int ieee80211_ioctl_giwscan(struct net_device *dev,
566 566
567 sdata = IEEE80211_DEV_TO_SUB_IF(dev); 567 sdata = IEEE80211_DEV_TO_SUB_IF(dev);
568 568
569 if (local->sta_sw_scanning || local->sta_hw_scanning) 569 if (local->sw_scanning || local->hw_scanning)
570 return -EAGAIN; 570 return -EAGAIN;
571 571
572 res = ieee80211_sta_scan_results(local, info, extra, data->length); 572 res = ieee80211_scan_results(local, info, extra, data->length);
573 if (res >= 0) { 573 if (res >= 0) {
574 data->length = res; 574 data->length = res;
575 return 0; 575 return 0;