diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-01 17:15:25 -0700 |
| commit | 5e58e5283a0a0a99ee970e7e5c80c6541693376e (patch) | |
| tree | 40409bad22ddc6c37b23ae8e518bbd6b2f39007c /net/mac80211/rx.c | |
| parent | c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a (diff) | |
| parent | ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb (diff) | |
| download | linux-5e58e5283a0a0a99ee970e7e5c80c6541693376e.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 5c1930ba8ebe..aa5cc37b4921 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -612,7 +612,8 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw, skipped++; continue; } - if (!time_after(jiffies, tid_agg_rx->reorder_time[j] + + if (skipped && + !time_after(jiffies, tid_agg_rx->reorder_time[j] + HT_RX_REORDER_BUF_TIMEOUT)) goto set_release_timer; |