Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc3fba60 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'origin'

parents b2faf597 e3f749c4

drivers/net/ppp_generic.c

+3 −0
Original line number Diff line number Diff line
@@ -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;