From patchwork Fri Feb 18 21:13:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vipin Mehta X-Patchwork-Id: 573981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1ILE90R005903 for ; Fri, 18 Feb 2011 21:14:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980Ab1BRVOH (ORCPT ); Fri, 18 Feb 2011 16:14:07 -0500 Received: from mail.atheros.com ([12.19.149.2]:53977 "EHLO mail.atheros.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753181Ab1BRVOG (ORCPT ); Fri, 18 Feb 2011 16:14:06 -0500 Received: from mail.atheros.com ([10.10.20.105]) by sidewinder.atheros.com for ; Fri, 18 Feb 2011 13:13:45 -0800 Received: from smtp.atheros.com (10.10.17.162) by SC1EXHC-01.global.atheros.com (10.10.20.111) with Microsoft SMTP Server (TLS) id 8.2.213.0; Fri, 18 Feb 2011 13:14:03 -0800 Received: by smtp.atheros.com (sSMTP sendmail emulation); Fri, 18 Feb 2011 13:14:03 -0800 From: Vipin Mehta To: CC: , , Subject: [PATCH 03/15] staging: ath6kl: Return correct scan complete status Date: Fri, 18 Feb 2011 13:13:04 -0800 Message-ID: <1298063596-2096-3-git-send-email-vmehta@atheros.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1298063596-2096-1-git-send-email-vmehta@atheros.com> References: <1298063596-2096-1-git-send-email-vmehta@atheros.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 18 Feb 2011 21:14:09 +0000 (UTC) diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c index b7742d4..bc5f6a7 100644 --- a/drivers/staging/ath6kl/os/linux/cfg80211.c +++ b/drivers/staging/ath6kl/os/linux/cfg80211.c @@ -791,7 +791,7 @@ ar6k_cfg80211_scanComplete_event(AR_SOFTC_T *ar, int status) wmi_iterate_nodes(ar->arWmi, ar6k_cfg80211_scan_node, ar->wdev->wiphy); cfg80211_scan_done(ar->scan_request, - (status & A_ECANCELED) ? true : false); + ((status & A_ECANCELED) || (status & A_EBUSY)) ? true : false); if(ar->scan_request->n_ssids && ar->scan_request->ssids[0].ssid_len) {