Commit 2aad7c8e authored by David S. Miller's avatar David S. Miller

de4x5: Use skb_queue_head instead of by-hand implementation.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebf05982
...@@ -832,7 +832,7 @@ struct de4x5_private { ...@@ -832,7 +832,7 @@ struct de4x5_private {
s32 csr14; /* Saved SIA TX/RX Register */ s32 csr14; /* Saved SIA TX/RX Register */
s32 csr15; /* Saved SIA General Register */ s32 csr15; /* Saved SIA General Register */
int save_cnt; /* Flag if state already saved */ int save_cnt; /* Flag if state already saved */
struct sk_buff *skb; /* Save the (re-ordered) skb's */ struct sk_buff_head queue; /* Save the (re-ordered) skb's */
} cache; } cache;
struct de4x5_srom srom; /* A copy of the SROM */ struct de4x5_srom srom; /* A copy of the SROM */
int cfrv; /* Card CFRV copy */ int cfrv; /* Card CFRV copy */
...@@ -1128,6 +1128,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) ...@@ -1128,6 +1128,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
printk(" which has an Ethernet PROM CRC error.\n"); printk(" which has an Ethernet PROM CRC error.\n");
return -ENXIO; return -ENXIO;
} else { } else {
skb_queue_head_init(&lp->cache.queue);
lp->cache.gepc = GEP_INIT; lp->cache.gepc = GEP_INIT;
lp->asBit = GEP_SLNK; lp->asBit = GEP_SLNK;
lp->asPolarity = GEP_SLNK; lp->asPolarity = GEP_SLNK;
...@@ -1487,7 +1488,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) ...@@ -1487,7 +1488,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
} }
} else if (skb->len > 0) { } else if (skb->len > 0) {
/* If we already have stuff queued locally, use that first */ /* If we already have stuff queued locally, use that first */
if (lp->cache.skb && !lp->interrupt) { if (!skb_queue_empty(&lp->cache.queue) && !lp->interrupt) {
de4x5_put_cache(dev, skb); de4x5_put_cache(dev, skb);
skb = de4x5_get_cache(dev); skb = de4x5_get_cache(dev);
} }
...@@ -1580,7 +1581,7 @@ de4x5_interrupt(int irq, void *dev_id) ...@@ -1580,7 +1581,7 @@ de4x5_interrupt(int irq, void *dev_id)
/* Load the TX ring with any locally stored packets */ /* Load the TX ring with any locally stored packets */
if (!test_and_set_bit(0, (void *)&lp->cache.lock)) { if (!test_and_set_bit(0, (void *)&lp->cache.lock)) {
while (lp->cache.skb && !netif_queue_stopped(dev) && lp->tx_enable) { while (!skb_queue_empty(&lp->cache.queue) && !netif_queue_stopped(dev) && lp->tx_enable) {
de4x5_queue_pkt(de4x5_get_cache(dev), dev); de4x5_queue_pkt(de4x5_get_cache(dev), dev);
} }
lp->cache.lock = 0; lp->cache.lock = 0;
...@@ -3679,11 +3680,7 @@ de4x5_free_tx_buffs(struct net_device *dev) ...@@ -3679,11 +3680,7 @@ de4x5_free_tx_buffs(struct net_device *dev)
} }
/* Unload the locally queued packets */ /* Unload the locally queued packets */
while (lp->cache.skb) { __skb_queue_purge(&lp->cache.queue);
dev_kfree_skb(de4x5_get_cache(dev));
}
return;
} }
/* /*
...@@ -3781,43 +3778,24 @@ static void ...@@ -3781,43 +3778,24 @@ static void
de4x5_put_cache(struct net_device *dev, struct sk_buff *skb) de4x5_put_cache(struct net_device *dev, struct sk_buff *skb)
{ {
struct de4x5_private *lp = netdev_priv(dev); struct de4x5_private *lp = netdev_priv(dev);
struct sk_buff *p;
if (lp->cache.skb) {
for (p=lp->cache.skb; p->next; p=p->next);
p->next = skb;
} else {
lp->cache.skb = skb;
}
skb->next = NULL;
return; __skb_queue_tail(&lp->cache.queue, skb);
} }
static void static void
de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb) de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb)
{ {
struct de4x5_private *lp = netdev_priv(dev); struct de4x5_private *lp = netdev_priv(dev);
struct sk_buff *p = lp->cache.skb;
lp->cache.skb = skb;
skb->next = p;
return; __skb_queue_head(&lp->cache.queue, skb);
} }
static struct sk_buff * static struct sk_buff *
de4x5_get_cache(struct net_device *dev) de4x5_get_cache(struct net_device *dev)
{ {
struct de4x5_private *lp = netdev_priv(dev); struct de4x5_private *lp = netdev_priv(dev);
struct sk_buff *p = lp->cache.skb;
if (p) { return __skb_dequeue(&lp->cache.queue);
lp->cache.skb = p->next;
p->next = NULL;
}
return p;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment