From 4da74b134ee0223e86a09a7a377d85a92151edae Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 16 Sep 2007 16:19:20 -0700
Subject: [PATCH] --- yaml --- r: 64996 b: refs/heads/master c:
 31bac44468257986484703cc09da8a9dcae88a36 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/pppoe.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index abc175d3fa32..bf4030f4ee8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 559cf710b07c5e2cfa3fb8d8f4a1320fd84c53f9
+refs/heads/master: 31bac44468257986484703cc09da8a9dcae88a36
diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c
index 68631a5721ac..5ac3eff6a2a6 100644
--- a/trunk/drivers/net/pppoe.c
+++ b/trunk/drivers/net/pppoe.c
@@ -385,12 +385,12 @@ static int pppoe_rcv(struct sk_buff *skb,
 	struct pppoe_hdr *ph;
 	struct pppox_sock *po;
 
-	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
-		goto drop;
-
 	if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
 		goto out;
 
+	if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
+		goto drop;
+
 	ph = pppoe_hdr(skb);
 
 	po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source, dev->ifindex);