From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: [PATCH wireless-2.6] mac80211: delete AddBA response timer
Date: Tue, 05 Oct 2010 21:40:33 +0200 [thread overview]
Message-ID: <1286307633.3641.29.camel@jlt3.sipsolutions.net> (raw)
From: Johannes Berg <johannes.berg@intel.com>
We never delete the addBA response timer, which
is typically fine, but if the station it belongs
to is deleted very quickly after starting the BA
session, before the peer had a chance to reply,
the timer may fire after the station struct has
been freed already. Therefore, we need to delete
the timer in a suitable spot -- best when the
session is being stopped (which will happen even
then) in which case the delete will be a no-op
most of the time.
I've reproduced the scenario and tested the fix.
Cc: stable@kernel.org
Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
This might be applicable to stable, but the code
has changed significantly, I'd appreciate any help
analysing and backporting it.
net/mac80211/agg-tx.c | 2 ++
1 file changed, 2 insertions(+)
--- wireless-testing.orig/net/mac80211/agg-tx.c 2010-10-05 21:00:59.000000000 +0200
+++ wireless-testing/net/mac80211/agg-tx.c 2010-10-05 21:01:11.000000000 +0200
@@ -176,6 +176,8 @@ int ___ieee80211_stop_tx_ba_session(stru
set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state);
+ del_timer_sync(&tid_tx->addba_resp_timer);
+
/*
* After this packets are no longer handed right through
* to the driver but are put onto tid_tx->pending instead,
next reply other threads:[~2010-10-05 19:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-05 19:40 Johannes Berg [this message]
2010-10-05 20:10 ` [PATCH wireless-2.6] mac80211: delete AddBA response timer Johannes Berg
2010-10-05 20:36 ` Ben Greear
2010-10-05 20:41 ` Johannes Berg
2010-10-05 20:52 ` Ben Greear
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286307633.3641.29.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).