From patchwork Mon Dec 28 03:18:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 69920 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBS3Idrh012399 for ; Mon, 28 Dec 2009 03:18:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751316AbZL1DSi (ORCPT ); Sun, 27 Dec 2009 22:18:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751282AbZL1DSh (ORCPT ); Sun, 27 Dec 2009 22:18:37 -0500 Received: from mga09.intel.com ([134.134.136.24]:22594 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbZL1DSh (ORCPT ); Sun, 27 Dec 2009 22:18:37 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 27 Dec 2009 19:17:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,461,1257148800"; d="scan'208";a="479520320" Received: from debian.sh.intel.com (HELO localhost.localdomain) ([10.239.13.65]) by orsmga002.jf.intel.com with ESMTP; 27 Dec 2009 19:18:13 -0800 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Zhu Yi , Johannes Berg Subject: [PATCH] mac80211: delete addba_resp_timer when stop Tx BA session Date: Mon, 28 Dec 2009 11:18:28 +0800 Message-Id: <1261970308-22926-1-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index ceda366..d122082 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -509,6 +509,8 @@ int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, u8 *state; int ret; + del_timer_sync(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer); + /* check if the TID is in aggregation */ state = &sta->ampdu_mlme.tid_state_tx[tid]; spin_lock_bh(&sta->lock);