mac80211: fix reorder buffer release
Subsystems (3)
PATCH 1/1 mac80211: fix reorder buffer release
From: Johannes Berg <[email protected]>
My patch "mac80211: correctly place aMPDU RX reorder code" uses an skb queue for MPDUs that were released from the buffer. I intentially didn't initialise and use the skb queue's spinlock, but in this place forgot that the code variant that doesn't touch the spinlock is needed.
Thanks to Christian Lamparter for quickly spotting the bug in the backtrace Reinette reported.
Reported-by Reinette Chatre <[email protected]>
Bug-identified-by Christian Lamparter <[email protected]>
Tested-by Reinette Chatre <[email protected]>
Signed-off-by Johannes Berg <[email protected]>
Signed-off-by John W. Linville <[email protected]>
---
Dave,
I missed this in today's pull request -- please queue it directly in your tree!
Thanks,
John
net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rx.c +1 -1
@@ -570,7 +570,7 @@ static void ieee80211_release_reorder_fr rate = &sband->bitrates[status->rate_idx]; tid_agg_rx->stored_mpdu_num--; tid_agg_rx->reorder_buf[index] =NULL ; -skb_queue_tail (frames, skb); +__skb_queue_tail (frames, skb); no_frame: tid_agg_rx->head_seq_num =seq_inc (tid_agg_rx->head_seq_num);
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
From: "John W. Linville" <[email protected]>
Date: Fri, 4 Dec 2009 16:55:55 -0500
Quoted 2 lines
I missed this in today's pull request -- please queue it directly in your tree!
Applied.