aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-01-17 13:43:15 -0800
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 19:27:29 -0500
commitdc4d5ea2218b80eb8cd323082f09c506ba75fb6f (patch)
tree67ddc5608641b91b05a066a3dd34c9e80908e504
parent762c2de2e61ef5f3c866d00861e6b1509cd8eacf (diff)
downloadlinux-dc4d5ea2218b80eb8cd323082f09c506ba75fb6f.tar.gz
[PATCH] sky2: don't bother clearing status ring elements
Don't need to zero out the status ring entries after processing. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/sky2.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1407ff2da41e0..3c5d00403e5e0 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1825,7 +1825,6 @@ static int sky2_poll(struct net_device *dev0, int *budget)
struct sk_buff *skb;
u32 status;
u16 length;
- u8 op;
le = hw->st_le + hw->st_idx;
hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE;
@@ -1839,10 +1838,8 @@ static int sky2_poll(struct net_device *dev0, int *budget)
sky2 = netdev_priv(dev);
status = le32_to_cpu(le->status);
length = le16_to_cpu(le->length);
- op = le->opcode & ~HW_OWNER;
- le->opcode = 0;
- switch (op) {
+ switch (le->opcode & ~HW_OWNER) {
case OP_RXSTAT:
skb = sky2_receive(sky2, length, status);
if (!skb)
@@ -1890,7 +1887,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
default:
if (net_ratelimit())
printk(KERN_WARNING PFX
- "unknown status opcode 0x%x\n", op);
+ "unknown status opcode 0x%x\n", le->opcode);
break;
}
}