From 018cbe55b84d777ae06eb4a454d0a13af643ff5d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 19 Apr 2010 10:48:38 +0200
Subject: [PATCH] --- yaml --- r: 190223 b: refs/heads/master c:
 b4bb5c3fd9333024044362df67e23e96158489ed h: refs/heads/master i:   190221:
 05cbffe7aca92fd39bd99523e2eabea946068d08   190219:
 161fe502bbe187d3320ad75e270bf7c15420772d   190215:
 de10a3aa9d218a58b3dd5640b76656ddfce18390   190207:
 70b22e19b0010161132c94feebf72163c0a434c5 v: v3

---
 [refs]                      | 2 +-
 trunk/net/mac80211/agg-tx.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dbaeb7cb88bd..a42aa9494f1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2fa1b015e9c199e45c836c769d94db595150731
+refs/heads/master: b4bb5c3fd9333024044362df67e23e96158489ed
diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c
index 5538e1b4a697..944a8a92207b 100644
--- a/trunk/net/mac80211/agg-tx.c
+++ b/trunk/net/mac80211/agg-tx.c
@@ -183,7 +183,6 @@ static void sta_addba_resp_timer_expired(unsigned long data)
 		       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
 						HT_ADDBA_REQUESTED_MSK) {
 		spin_unlock_bh(&sta->lock);
-		*state = HT_AGG_STATE_IDLE;
 #ifdef CONFIG_MAC80211_HT_DEBUG
 		printk(KERN_DEBUG "timer expired on tid %d but we are not "
 				"(or no longer) expecting addBA response there",