aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-01-17 16:43:15 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 19:27:29 -0500
commitdc4d5ea2218b80eb8cd323082f09c506ba75fb6f (patch)
tree67ddc5608641b91b05a066a3dd34c9e80908e504
parent762c2de2e61ef5f3c866d00861e6b1509cd8eacf (diff)
[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 1407ff2da41e..3c5d00403e5e 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)
1825 struct sk_buff *skb; 1825 struct sk_buff *skb;
1826 u32 status; 1826 u32 status;
1827 u16 length; 1827 u16 length;
1828 u8 op;
1829 1828
1830 le = hw->st_le + hw->st_idx; 1829 le = hw->st_le + hw->st_idx;
1831 hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE; 1830 hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE;
@@ -1839,10 +1838,8 @@ static int sky2_poll(struct net_device *dev0, int *budget)
1839 sky2 = netdev_priv(dev); 1838 sky2 = netdev_priv(dev);
1840 status = le32_to_cpu(le->status); 1839 status = le32_to_cpu(le->status);
1841 length = le16_to_cpu(le->length); 1840 length = le16_to_cpu(le->length);
1842 op = le->opcode & ~HW_OWNER;
1843 le->opcode = 0;
1844 1841
1845 switch (op) { 1842 switch (le->opcode & ~HW_OWNER) {
1846 case OP_RXSTAT: 1843 case OP_RXSTAT:
1847 skb = sky2_receive(sky2, length, status); 1844 skb = sky2_receive(sky2, length, status);
1848 if (!skb) 1845 if (!skb)
@@ -1890,7 +1887,7 @@ static int sky2_poll(struct net_device *dev0, int *budget)
1890 default: 1887 default:
1891 if (net_ratelimit()) 1888 if (net_ratelimit())
1892 printk(KERN_WARNING PFX 1889 printk(KERN_WARNING PFX
1893 "unknown status opcode 0x%x\n", op); 1890 "unknown status opcode 0x%x\n", le->opcode);
1894 break; 1891 break;
1895 } 1892 }
1896 } 1893 }