summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 14:35:35 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-06 14:35:35 -0200
commitfc3fba60f5d292a3b875e2498577fc35bd68b9da (patch)
tree09a020ee7bf4f02d8ce0f5e5d8ce331e792db707 /drivers
parentb2faf597d93bdf5e2d12d93ea0815935a73f749e (diff)
parente3f749c4af69c4344d89f11e2293e3790eb4eaca (diff)
downloadblackbird-op-linux-fc3fba60f5d292a3b875e2498577fc35bd68b9da.tar.gz
blackbird-op-linux-fc3fba60f5d292a3b875e2498577fc35bd68b9da.zip
Merge branch 'origin'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ppp_generic.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 1c6d328165bb..0245e40b51a1 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -1610,6 +1610,8 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
}
else if (!pskb_may_pull(skb, skb->len))
goto err;
+ else
+ skb->ip_summed = CHECKSUM_NONE;
len = slhc_uncompress(ppp->vj, skb->data + 2, skb->len - 2);
if (len <= 0) {
@@ -1690,6 +1692,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
kfree_skb(skb);
} else {
skb_pull(skb, 2); /* chop off protocol */
+ skb_postpull_rcsum(skb, skb->data - 2, 2);
skb->dev = ppp->dev;
skb->protocol = htons(npindex_to_ethertype[npi]);
skb->mac.raw = skb->data;
OpenPOWER on IntegriCloud