diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-06-09 16:45:08 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-06-09 21:38:40 +0200 |
| commit | 472be00d04edccbc1ad2d79540b1e9ea99cc7c7f (patch) | |
| tree | aac8b53f2780d026d844cd5d206a6393052b55f8 | |
| parent | c526a467671960922b5cb5fc385a1813602526bc (diff) | |
| download | linux-472be00d04edccbc1ad2d79540b1e9ea99cc7c7f.tar.bz2 | |
mac80211: handle aggregation session timeout on fast-xmit path
The conversion to the fast-xmit path lost proper aggregation session
timeout handling - the last_tx wasn't set on that path and the timer
would therefore incorrectly tear down the session periodically (with
those drivers/rate control algorithms that have a timeout.)
In case of iwlwifi, this was every 5 seconds and caused significant
throughput degradation.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/tx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index dbef1b881b3d..7fe528adc5ae 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -2719,9 +2719,12 @@ static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata, if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) { tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); - if (tid_tx && - !test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) - return false; + if (tid_tx) { + if (!test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) + return false; + if (tid_tx->timeout) + tid_tx->last_tx = jiffies; + } } /* after this point (skb is modified) we cannot return false */ |