summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2008-08-31 20:15:40 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2008-09-05 20:17:46 (GMT)
commit0c25970dc1b0d46f2357e7c4b267ab7b93eb7cdd (patch)
tree43152aee183ccf979ff62087bd9ba81647c204b0 /drivers/net/wireless/p54
parentc41a40c58b623f97dd2e23aa3baab2cedb47d99f (diff)
downloadlinux-fsl-qoriq-0c25970dc1b0d46f2357e7c4b267ab7b93eb7cdd.tar.xz
p54pci: increase ring buffer index counter when skipping
I'm afraid, I forgot to add the following lines to 7262d59366 ("p54pci: rx tasklet refactoring"). These changes are necessary to ensure loop termination. Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/p54pci.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index e9db449..a0395af 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/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)) {