OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c41a40c
)
p54pci: increase ring buffer index counter when skipping
author
Christian Lamparter
<chunkeey@web.de>
Sun, 31 Aug 2008 20:15:40 +0000
(22:15 +0200)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 5 Sep 2008 20:17:46 +0000
(16:17 -0400)
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>
drivers/net/wireless/p54/p54pci.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/p54/p54pci.c
b/drivers/net/wireless/p54/p54pci.c
index
e9db449
..
a0395af
100644
(file)
--- 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)) {