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

ppp: Use SKB queue abstraction interfaces in fragment processing.

Browse Source 
No more direct references to SKB queue and list implementation
details.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-01-20 22:52:05 -08:00
parent 686a295553
commit d52344a7ae
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/ppp_generic.c
View File

@ -1998,7 +1998,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
u32 seq = ppp->nextseq; u32 seq = ppp->nextseq;
u32 minseq = ppp->minseq; u32 minseq = ppp->minseq;
struct sk_buff_head *list = &ppp->mrq; struct sk_buff_head *list = &ppp->mrq;
struct sk_buff *p, *next; struct sk_buff *p, *tmp;
struct sk_buff *head, *tail; struct sk_buff *head, *tail;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
int lost = 0, len = 0; int lost = 0, len = 0;
@ -2007,14 +2007,15 @@ ppp_mp_reconstruct(struct ppp *ppp)
return NULL; return NULL;
head = list->next; head = list->next;
tail = NULL; tail = NULL;
for (p = head; p != (struct sk_buff *) list; p = next) { skb_queue_walk_safe(list, p, tmp) {
next = p->next; again:
if (seq_before(PPP_MP_CB(p)->sequence, seq)) { if (seq_before(PPP_MP_CB(p)->sequence, seq)) {
/* this can't happen, anyway ignore the skb */ /* this can't happen, anyway ignore the skb */
netdev_err(ppp->dev, "ppp_mp_reconstruct bad " netdev_err(ppp->dev, "ppp_mp_reconstruct bad "
"seq %u < %u\n", "seq %u < %u\n",
PPP_MP_CB(p)->sequence, seq); PPP_MP_CB(p)->sequence, seq);
head = next; __skb_unlink(p, list);
kfree_skb(p);
continue; continue;
} }
if (PPP_MP_CB(p)->sequence != seq) { if (PPP_MP_CB(p)->sequence != seq) {
@ -2026,8 +2027,7 @@ ppp_mp_reconstruct(struct ppp *ppp)
lost = 1; lost = 1;
seq = seq_before(minseq, PPP_MP_CB(p)->sequence)? seq = seq_before(minseq, PPP_MP_CB(p)->sequence)?
minseq + 1: PPP_MP_CB(p)->sequence; minseq + 1: PPP_MP_CB(p)->sequence;
next = p; goto again;
continue;
} }
/* /*
@ -2067,9 +2067,17 @@ ppp_mp_reconstruct(struct ppp *ppp)
* and we haven't found a complete valid packet yet, * and we haven't found a complete valid packet yet,
* we can discard up to and including this fragment. * we can discard up to and including this fragment.
*/ */
if (PPP_MP_CB(p)->BEbits & E) if (PPP_MP_CB(p)->BEbits & E) {
head = next; struct sk_buff *tmp2;
skb_queue_reverse_walk_from_safe(list, p, tmp2) {
__skb_unlink(p, list);
kfree_skb(p);
}
head = skb_peek(list);
if (!head)
break;
}
++seq; ++seq;
} }
@ -2110,13 +2118,6 @@ ppp_mp_reconstruct(struct ppp *ppp)
} }
ppp->nextseq = PPP_MP_CB(tail)->sequence + 1; ppp->nextseq = PPP_MP_CB(tail)->sequence + 1;
head = tail->next;
}
/* Discard all the skbuffs that we can't use. */
while ((p = list->next) != head) {
__skb_unlink(p, list);
kfree_skb(p);
} }
return skb; return skb;