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

Merge branch 'origin'

Browse Source
This commit is contained in:
Mauro Carvalho Chehab 2006-02-06 14:35:35 -02:00
commit fc3fba60f5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ppp_generic.c
View File

@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
} }
else if (!pskb_may_pull(skb, skb->len)) else if (!pskb_may_pull(skb, skb->len))
goto err; goto err;
else
skb->ip_summed = CHECKSUM_NONE;
len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2); len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
if (len <= 0) { if (len <= 0) {
@ -1690,6 +1692,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
kfree_skb(skb); kfree_skb(skb);
} else { } else {
skb_pull(skb, 2); /* chop off protocol */ skb_pull(skb, 2); /* chop off protocol */
skb_postpull_rcsum(skb, skb->data - 2, 2);
skb->dev = ppp->dev; skb->dev = ppp->dev;
skb->protocol = htons(npindex_to_ethertype[npi]); skb->protocol = htons(npindex_to_ethertype[npi]);
skb->mac.raw = skb->data; skb->mac.raw = skb->data;