Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 07ae2dfcf4f7143ce191c6436da1c33f179af0d6

Authored by Eliad Peller
Committed by John W. Linville
1 parent 3d29dd9b5b
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mac80211: timeout a single frame in the rx reorder buffer 

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>
Cc: <stable@vger.kernel.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -611,7 +611,7 @@
611 611 index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
612 612 tid_agg_rx->buf_size;
613 613 if (!tid_agg_rx->reorder_buf[index] &&
614   - tid_agg_rx->stored_mpdu_num > 1) {
  614 + tid_agg_rx->stored_mpdu_num) {
615 615 /*
616 616 * No buffers ready to be released, but check whether any
617 617 * frames in the reorder buffer have timed out.