iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

econet: Use SKB queue and list helpers instead of doing it by-hand.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-05-28 16:46:29 -07:00
parent bec571ec76
commit de1033428b
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/econet/af_econet.c
View File

@ -901,15 +901,10 @@ static void aun_tx_ack(unsigned long seq, int result)
struct ec_cb *eb; struct ec_cb *eb;
spin_lock_irqsave(&aun_queue_lock, flags); spin_lock_irqsave(&aun_queue_lock, flags);
skb = skb_peek(&aun_queue); skb_queue_walk(&aun_queue, skb) {
while (skb && skb != (struct sk_buff *)&aun_queue)
{
struct sk_buff *newskb = skb->next;
eb = (struct ec_cb *)&skb->cb; eb = (struct ec_cb *)&skb->cb;
if (eb->seq == seq) if (eb->seq == seq)
goto foundit; goto foundit;
skb = newskb;
} }
spin_unlock_irqrestore(&aun_queue_lock, flags); spin_unlock_irqrestore(&aun_queue_lock, flags);
printk(KERN_DEBUG "AUN: unknown sequence %ld\n", seq); printk(KERN_DEBUG "AUN: unknown sequence %ld\n", seq);
@ -982,23 +977,18 @@ static void aun_data_available(struct sock *sk, int slen)
static void ab_cleanup(unsigned long h) static void ab_cleanup(unsigned long h)
{ {
struct sk_buff *skb; struct sk_buff *skb, *n;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&aun_queue_lock, flags); spin_lock_irqsave(&aun_queue_lock, flags);
skb = skb_peek(&aun_queue); skb_queue_walk_safe(&aun_queue, skb, n) {
while (skb && skb != (struct sk_buff *)&aun_queue)
{
struct sk_buff *newskb = skb->next;
struct ec_cb *eb = (struct ec_cb *)&skb->cb; struct ec_cb *eb = (struct ec_cb *)&skb->cb;
if ((jiffies - eb->start) > eb->timeout) if ((jiffies - eb->start) > eb->timeout) {
{
tx_result(skb->sk, eb->cookie, tx_result(skb->sk, eb->cookie,
ECTYPE_TRANSMIT_NOT_PRESENT); ECTYPE_TRANSMIT_NOT_PRESENT);
skb_unlink(skb, &aun_queue); skb_unlink(skb, &aun_queue);
kfree_skb(skb); kfree_skb(skb);
} }
skb = newskb;
} }
spin_unlock_irqrestore(&aun_queue_lock, flags); spin_unlock_irqrestore(&aun_queue_lock, flags);