From 87b9dd28311c0da9f99e62f619e2104a718f7c5f Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@web.de>
Date: Sun, 31 Aug 2008 22:15:40 +0200
Subject: [PATCH] --- yaml --- r: 111407 b: refs/heads/master c:
 0c25970dc1b0d46f2357e7c4b267ab7b93eb7cdd h: refs/heads/master i:   111405:
 28e892ea7231c5eddd1588cc4ecc9aff6af8fa9d   111403:
 a986183b694954f9ccb51a49c58ae75da839d29e   111399:
 5ab41241742089ebcf58f041e021f4ce2fc6ce12   111391:
 12d4f154e9553d8c0a592499de599bae2e110a72 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/net/wireless/p54/p54pci.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b1286dcb0eaa..95f5161bc2ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c41a40c58b623f97dd2e23aa3baab2cedb47d99f
+refs/heads/master: 0c25970dc1b0d46f2357e7c4b267ab7b93eb7cdd
diff --git a/trunk/drivers/net/wireless/p54/p54pci.c b/trunk/drivers/net/wireless/p54/p54pci.c
index e9db4495c626..a0395af74c2d 100644
--- a/trunk/drivers/net/wireless/p54/p54pci.c
+++ b/trunk/drivers/net/wireless/p54/p54pci.c
@@ -301,9 +301,11 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
 		len = le16_to_cpu(desc->len);
 		skb = rx_buf[i];
 
-		if (!skb)
+		if (!skb) {
+			i++;
+			i %= ring_limit;
 			continue;
-
+		}
 		skb_put(skb, len);
 
 		if (p54_rx(dev, skb)) {