From d9124f5bdf30a8021286747df7b1e6469c9adbb2 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 27 Oct 2011 18:47:46 +0300 Subject: [PATCH] --- yaml --- r: 278079 b: refs/heads/master c: cb93821a9eaf53fb60addd689d3fa9f106790be1 h: refs/heads/master i: 278077: 6cc48d44186a0e69eaec10114428680ee24bfe4a 278075: 580c0ea862da031066b76c21935f8b091da1e122 278071: 2673504ffb40663ea26c1e1159c653a4c75a233b 278063: ac531dac73aebe9c8216537e236f5436f1c6a97a 278047: bd40f318902991085b9905ca8a65c1a699533372 278015: ed8239c17e0d30d93d94494d9c08efa0b369d23d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87d842b06103..7892c4ca2bae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3101edef5cc43034cd809e7105ea2b366e9c7c00 +refs/heads/master: cb93821a9eaf53fb60addd689d3fa9f106790be1 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index 940aeb69d20c..01bb9ede471b 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -874,6 +874,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status) { struct ath6kl *ar = vif->ar; + bool aborted; int i; ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: status %d\n", __func__, status); @@ -882,11 +883,11 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status) return; if ((status == -ECANCELED) || (status == -EBUSY)) { - cfg80211_scan_done(vif->scan_req, true); + aborted = true; goto out; } - cfg80211_scan_done(vif->scan_req, false); + aborted = false; if (vif->scan_req->n_ssids && vif->scan_req->ssids[0].ssid_len) { for (i = 0; i < vif->scan_req->n_ssids; i++) { @@ -897,6 +898,7 @@ void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, int status) } out: + cfg80211_scan_done(vif->scan_req, aborted); vif->scan_req = NULL; }