From 0f04ef4524756e73658a97dbb76ea443134b40ad Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 19 Feb 2013 15:32:42 +0200
Subject: [PATCH] --- yaml --- r: 368450 b: refs/heads/master c:
 80d8565557747854d6ff7fc0a756cc71a9fa2372 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/iwlwifi/mvm/sta.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8281dc52c6f0..e724188f0f3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d158efa5577f3851d36f2bdf42ea7af66668b9c
+refs/heads/master: 80d8565557747854d6ff7fc0a756cc71a9fa2372
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c b/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
index 1970001bf96d..ca7aba404502 100644
--- a/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -340,6 +340,9 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
 
 	if (vif->type == NL80211_IFTYPE_STATION &&
 	    mvmvif->ap_sta_id == mvm_sta->sta_id) {
+		/* flush its queues here since we are freeing mvm_sta */
+		ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, true);
+
 		/*
 		 * Put a non-NULL since the fw station isn't removed.
 		 * It will be removed after the MAC will be set as
@@ -348,9 +351,6 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm,
 		rcu_assign_pointer(mvm->fw_id_to_mac_id[mvm_sta->sta_id],
 				   ERR_PTR(-EINVAL));
 
-		/* flush its queues here since we are freeing mvm_sta */
-		ret = iwl_mvm_flush_tx_path(mvm, mvm_sta->tfd_queue_msk, true);
-
 		/* if we are associated - we can't remove the AP STA now */
 		if (vif->bss_conf.assoc)
 			return ret;