From b7024f40cb13d8e2e184210f18ad9278d6a25fc8 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 3 Aug 2009 21:58:26 +0200
Subject: [PATCH] --- yaml --- r: 156870 b: refs/heads/master c:
 d25f9f1357139bbdc79bc960ea84909a7c22ec2b h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/wireless/mwl8k.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f1462bac9f56..0ee59dea0e8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dd2459d8f7a967bcd1466591aec72bb3ddc07cc
+refs/heads/master: d25f9f1357139bbdc79bc960ea84909a7c22ec2b
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index a263d5c84c08..71f3eb67981e 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -1012,6 +1012,8 @@ static int rxq_process(struct ieee80211_hw *hw, int index, int limit)
 		rmb();
 
 		skb = rxq->rx_skb[rxq->rx_head];
+		if (skb == NULL)
+			break;
 		rxq->rx_skb[rxq->rx_head] = NULL;
 
 		rxq->rx_head = (rxq->rx_head + 1) % MWL8K_RX_DESCS;