diff options
author | David S. Miller <davem@davemloft.net> | 2012-02-04 16:10:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-04 16:10:34 -0500 |
commit | 1715322f3e0600b664fa8b780a07de104f49c104 (patch) | |
tree | 2c3fa98151f4763b1cb0bdc854cf3bc5039a6034 /net | |
parent | 542a398080ff4a2fcf6a8f3ae642dad5fbc8877e (diff) | |
parent | 157ca9eae92bc5247f93bea4ecb50dfacc283a04 (diff) | |
download | op-kernel-dev-1715322f3e0600b664fa8b780a07de104f49c104.zip op-kernel-dev-1715322f3e0600b664fa8b780a07de104f49c104.tar.gz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 7514091..5a5e504 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. |