summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-10-06 11:22:11 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-10-06 16:30:42 -0400
commit6eb11a9a311a0f7e5b9b66c18f7498a26c9ec206 (patch)
treed65e943dc4e3099c84968fed00451bd118a0470d
parent4136c4224ccf1907d309e1cdfaefef9da97dbc5e (diff)
mac80211: do not requeue scan work when not needed
When performing hw scan and not abort it, __ieee80211_scan_completed() is currently called from scan work, so does not need to reschedule work to call drv_hw_scan(). Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/scan.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 4dbef714d94..9aab921f7ca 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -269,9 +269,9 @@ static bool __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
return false;
if (was_hw_scan && !aborted && ieee80211_prep_hw_scan(local)) {
- ieee80211_queue_delayed_work(&local->hw,
- &local->scan_work, 0);
- return false;
+ int rc = drv_hw_scan(local, local->scan_sdata, local->hw_scan_req);
+ if (rc == 0)
+ return false;
}
kfree(local->hw_scan_req);
@@ -656,15 +656,6 @@ void ieee80211_scan_work(struct work_struct *work)
if (!sdata || !local->scan_req)
goto out;
- if (local->hw_scan_req) {
- int rc = drv_hw_scan(local, sdata, local->hw_scan_req);
- if (rc) {
- aborted = true;
- goto out_complete;
- } else
- goto out;
- }
-
if (local->scan_req && !local->scanning) {
struct cfg80211_scan_request *req = local->scan_req;
int rc;