From 2b3ed12df371e26aecfda48fffa479de1f4840b4 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 9 Jun 2006 16:11:27 -0700
Subject: [PATCH] --- yaml --- r: 27564 b: refs/heads/master c:
 c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/ppp_generic.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2b7433b951bc..5095a7ed11e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 364c6badde0dd62a0a38e5ed67f85d87d6665780
+refs/heads/master: c8c9f9a3de2c50c876b1068dd41f9a06c5749f80
diff --git a/trunk/drivers/net/ppp_generic.c b/trunk/drivers/net/ppp_generic.c
index b2073fce8216..01cd8ec751ea 100644
--- a/trunk/drivers/net/ppp_generic.c
+++ b/trunk/drivers/net/ppp_generic.c
@@ -1609,8 +1609,6 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb)
 			kfree_skb(skb);
 			skb = ns;
 		}
-		else if (!pskb_may_pull(skb, skb->len))
-			goto err;
 		else
 			skb->ip_summed = CHECKSUM_NONE;