From a7da3568d032d6a3e06a12eee680c9aac13ace25 Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Mon, 4 Mar 2013 09:11:08 +0200
Subject: [PATCH] --- yaml --- r: 361077 b: refs/heads/master c:
 f9aa8dd33714f17c7229ad89309406a1ccb3cd3f h: refs/heads/master i:   361075:
 079f6942230d58e4ea0db76f7f4becfac1023b91 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/iwlwifi/mvm/sta.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bd26aceea118..52bbb46cda0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de8bc6dd2d52cacaa76ea381ffdc00919b100a2c
+refs/heads/master: f9aa8dd33714f17c7229ad89309406a1ccb3cd3f
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c b/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
index 861a7f9f8e7f..274f44e2ef60 100644
--- a/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/trunk/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -770,6 +770,16 @@ int iwl_mvm_sta_tx_agg_stop(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	u16 txq_id;
 	int err;
 
+
+	/*
+	 * If mac80211 is cleaning its state, then say that we finished since
+	 * our state has been cleared anyway.
+	 */
+	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
+		ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+		return 0;
+	}
+
 	spin_lock_bh(&mvmsta->lock);
 
 	txq_id = tid_data->txq_id;