diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-03 20:14:07 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-03 20:14:07 +0100 |
| commit | 157ca9eae92bc5247f93bea4ecb50dfacc283a04 (patch) | |
| tree | 2bf88c36d1a7513c3dbb2babd6feb64ed2ce558c /net | |
| parent | can: peak_pci: Fix the way channels are linked together (diff) | |
| parent | mac80211: timeout a single frame in the rx reorder buffer (diff) | |
| download | linux-157ca9eae92bc5247f93bea4ecb50dfacc283a04.tar.xz linux-157ca9eae92bc5247f93bea4ecb50dfacc283a04.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 751409120769..5a5e504a8ffb 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -611,7 +611,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw, index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % tid_agg_rx->buf_size; if (!tid_agg_rx->reorder_buf[index] && - tid_agg_rx->stored_mpdu_num > 1) { + tid_agg_rx->stored_mpdu_num) { /* * No buffers ready to be released, but check whether any * frames in the reorder buffer have timed out. |