All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mac80211: timeout a single frame in the rx reorder buffer
@ 2012-02-01 12:06 Eliad Peller
  2012-02-01 15:51 ` Johannes Berg
  0 siblings, 1 reply; 3+ messages in thread
From: Eliad Peller @ 2012-02-01 12:06 UTC (permalink / raw)
  To: Johannes Berg; +Cc: linux-wireless

The current code checks for stored_mpdu_num > 1, causing
the reorder_timer to be triggered indefinitely, but the
frame is never timed-out (until the next packet is received)

Signed-off-by: Eliad Peller <eliad@wizery.com>
---
 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 f407427..7e3980f 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.
-- 
1.7.6.401.g6a319


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: timeout a single frame in the rx reorder buffer
  2012-02-01 12:06 [PATCH] mac80211: timeout a single frame in the rx reorder buffer Eliad Peller
@ 2012-02-01 15:51 ` Johannes Berg
  2012-02-01 16:32   ` Eliad Peller
  0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2012-02-01 15:51 UTC (permalink / raw)
  To: Eliad Peller; +Cc: linux-wireless

On Wed, 2012-02-01 at 14:06 +0200, Eliad Peller wrote:
> The current code checks for stored_mpdu_num > 1, causing
> the reorder_timer to be triggered indefinitely, but the
> frame is never timed-out (until the next packet is received)

Acked-by: Johannes Berg <johannes@sipsolutions.net>

Looks kinda obvious & trivial, want to CC stable?

> Signed-off-by: Eliad Peller <eliad@wizery.com>
> ---
>  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 f407427..7e3980f 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.



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mac80211: timeout a single frame in the rx reorder buffer
  2012-02-01 15:51 ` Johannes Berg
@ 2012-02-01 16:32   ` Eliad Peller
  0 siblings, 0 replies; 3+ messages in thread
From: Eliad Peller @ 2012-02-01 16:32 UTC (permalink / raw)
  To: Johannes Berg; +Cc: linux-wireless

On Wed, Feb 1, 2012 at 5:51 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
> On Wed, 2012-02-01 at 14:06 +0200, Eliad Peller wrote:
>> The current code checks for stored_mpdu_num > 1, causing
>> the reorder_timer to be triggered indefinitely, but the
>> frame is never timed-out (until the next packet is received)
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
> Looks kinda obvious & trivial, want to CC stable?
>
Sure. i'll resend.

Eliad.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-02-01 16:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-01 12:06 [PATCH] mac80211: timeout a single frame in the rx reorder buffer Eliad Peller
2012-02-01 15:51 ` Johannes Berg
2012-02-01 16:32   ` Eliad Peller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.