From patchwork Fri Sep 24 16:22:01 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Florian Mickler <florian@mickler.org>
X-Patchwork-Id: 204822
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 o8OGMIe7028243
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 24 Sep 2010 16:22:18 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932381Ab0IXQWQ (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 24 Sep 2010 12:22:16 -0400
Received: from ist.d-labs.de ([213.239.218.44]:53776 "EHLO mx01.d-labs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753818Ab0IXQWQ (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Fri, 24 Sep 2010 12:22:16 -0400
Received: from schatten.dmk.lab (f053214062.adsl.alicedsl.de [78.53.214.62])
	by mx01.d-labs.de (Postfix) with ESMTP id 1BE107FF41;
	Fri, 24 Sep 2010 18:22:17 +0200 (CEST)
Received: by schatten.dmk.lab (Postfix, from userid 1000)
	id 0A5A7A9C003; Fri, 24 Sep 2010 18:22:13 +0200 (CEST)
From: Florian Mickler <florian@mickler.org>
To: linux-wireless@vger.kernel.org
Cc: Florian Mickler <florian@mickler.org>,
	Reinette Chatre <reinette.chatre@intel.com>,
	Wey-Yi Guy <wey-yi.w.guy@intel.com>,
	Intel Linux Wireless <ilw@linux.intel.com>,
	"John W. Linville" <linville@tuxdriver.com>,
	Johannes Berg <johannes.berg@intel.com>, Zhu Yi <yi.zhu@intel.com>,
	Ben Cahill <ben.m.cahill@intel.com>, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH] iwl3945: queue the right work if the scan needs to be
	aborted
Date: Fri, 24 Sep 2010 18:22:01 +0200
Message-Id: <1285345323-4250-1-git-send-email-florian@mickler.org>
X-Mailer: git-send-email 1.7.3
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 24 Sep 2010 16:22:18 +0000 (UTC)


diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 9dd9e64..8fd00a6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1411,7 +1411,7 @@ void iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	clear_bit(STATUS_SCAN_HW, &priv->status);
 	clear_bit(STATUS_SCANNING, &priv->status);
 	/* inform mac80211 scan aborted */
-	queue_work(priv->workqueue, &priv->scan_completed);
+	queue_work(priv->workqueue, &priv->abort_scan);
 }
 
 int iwlagn_manage_ibss_station(struct iwl_priv *priv,
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 59a308b..d31661c 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3018,7 +3018,7 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
 	clear_bit(STATUS_SCANNING, &priv->status);
 
 	/* inform mac80211 scan aborted */
-	queue_work(priv->workqueue, &priv->scan_completed);
+	queue_work(priv->workqueue, &priv->abort_scan);
 }
 
 static void iwl3945_bg_restart(struct work_struct *data)