[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091204215555.GC3595@tuxdriver.com>
Date: Fri, 4 Dec 2009 16:55:55 -0500
From: "John W. Linville" <linville@...driver.com>
To: davem@...emloft.net
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, chunkeey@...glemail.com,
reinette.chatre@...el.com
Subject: [PATCH] mac80211: fix reorder buffer release
From: Johannes Berg <johannes@...solutions.net>
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 <reinette.chatre@...el.com>
Bug-identified-by: Christian Lamparter <chunkeey@...glemail.com>
Tested-by: Reinette Chatre <reinette.chatre@...el.com>
Signed-off-by: Johannes Berg <johannes@...solutions.net>
Signed-off-by: John W. Linville <linville@...driver.com>
---
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(-)
--- wireless-testing.orig/net/mac80211/rx.c 2009-12-03 20:18:21.000000000 +0100
+++ wireless-testing/net/mac80211/rx.c 2009-12-03 20:42:50.000000000 +0100
@@ -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);
--
John W. Linville Someday the world will need a hero, and you
linville@...driver.com might be all we have. Be ready.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists