Merge branch 'origin'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 16:35:35 +0000 (14:35 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 16:35:35 +0000 (14:35 -0200)
drivers/net/ppp_generic.c

index 1c6d328165bb066bd132b44c1fe4d4cbbbc0a096..0245e40b51a1f685e317f2ee4858475ea6d7ec14 100644 (file)
@@ -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;