From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 17/23] mac80211: fix RX aggregation timer
Date: Thu, 10 Jun 2010 10:21:45 +0200 [thread overview]
Message-ID: <20100610082231.910424119@sipsolutions.net> (raw)
In-Reply-To: 20100610082128.641664439@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
I noticed that when there was _no_ traffic at
all on a given aggregation session, it would
never time out. This won't happen unless you
forced creating a session, but fix it anyway.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/agg-rx.c | 4 ++++
1 file changed, 4 insertions(+)
--- wireless-testing.orig/net/mac80211/agg-rx.c 2010-06-09 17:21:15.000000000 +0200
+++ wireless-testing/net/mac80211/agg-rx.c 2010-06-09 17:21:15.000000000 +0200
@@ -274,6 +274,10 @@ void ieee80211_process_addba_request(str
/* activate it for RX */
rcu_assign_pointer(sta->ampdu_mlme.tid_rx[tid], tid_agg_rx);
+
+ if (timeout)
+ mod_timer(&tid_agg_rx->session_timer, TU_TO_EXP_TIME(timeout));
+
end:
spin_unlock_bh(&sta->lock);
next prev parent reply other threads:[~2010-06-10 8:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 8:21 [PATCH 00/23] aggregation locking rework Johannes Berg
2010-06-10 8:21 ` [PATCH 01/23] mac80211: simplify station/aggregation code Johannes Berg
2010-06-10 8:21 ` [PATCH 02/23] mac80211: use common skb queue Johannes Berg
2010-06-10 8:21 ` [PATCH 03/23] mac80211: use common work struct Johannes Berg
2010-06-10 8:21 ` [PATCH 04/23] mac80211: use common work function Johannes Berg
2010-06-10 8:21 ` [PATCH 05/23] mac80211: common work skb freeing Johannes Berg
2010-06-10 8:21 ` [PATCH 06/23] mac80211: pull mgmt frame rx into rx handler Johannes Berg
2010-06-10 8:21 ` [PATCH 07/23] mac80211: always process blockack action from workqueue Johannes Berg
2010-06-10 8:21 ` [PATCH 08/23] mac80211: move blockack stop due to fragmentation Johannes Berg
2010-06-10 8:21 ` [PATCH 09/23] mac80211: move aggregation callback processing Johannes Berg
2010-06-10 8:21 ` [PATCH 10/23] mac80211: use RCU for RX aggregation Johannes Berg
2010-06-10 8:21 ` [PATCH 11/23] mac80211: use RCU for TX aggregation Johannes Berg
2010-06-10 8:21 ` [PATCH 12/23] mac80211: remove non-irqsafe aggregation callbacks Johannes Berg
2010-06-10 8:21 ` [PATCH 13/23] mac80211: refcount aggregation queue stop Johannes Berg
2010-06-10 8:21 ` [PATCH 14/23] mac80211: make TX aggregation start/stop request async Johannes Berg
2010-06-10 8:21 ` [PATCH 15/23] mac80211: move BA session work Johannes Berg
2010-06-10 8:21 ` [PATCH 16/23] mac80211: defer RX agg session teardown to work Johannes Berg
2010-06-10 8:21 ` Johannes Berg [this message]
2010-06-10 8:21 ` [PATCH 18/23] mac80211: change RX aggregation locking Johannes Berg
2010-06-10 8:21 ` [PATCH 19/23] mac80211: defer TX agg session teardown to work Johannes Berg
2010-06-10 8:21 ` [PATCH 20/23] mac80211: change TX aggregation locking Johannes Berg
2010-06-10 8:21 ` [PATCH 21/23] mac80211: allow drivers to sleep in ampdu_action Johannes Berg
2010-06-10 8:21 ` [PATCH 22/23] mac80211: update aggregation documentation Johannes Berg
2010-06-10 8:21 ` [PATCH 23/23] mac80211: fix mgmt frame accounting Johannes Berg
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=20100610082231.910424119@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).