From 023f00120bf4ddbd5e4fd8d321cea7d26e35168c Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 10 Jun 2008 14:08:25 -0700 Subject: [PATCH] --- yaml --- r: 97935 b: refs/heads/master c: bc6cffd177f9266af38dba96a2cea06c1e7ff932 h: refs/heads/master i: 97933: 91b1bcf546bae2e633b3c7d0ffb3200f1688cf3e 97931: 690cd0c76b0703ee93a3d8f6e138377cebb4c6cf 97927: 37734cea5c2d2f56989227c5b57fbf095518761e 97919: cce120f8f117881f80ef18d2e1bf59c0df587c1a v: v3 --- [refs] | 2 +- trunk/drivers/net/pppoe.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d93c2361656..b30bd460ae95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 392fdb0e35055b96faa9c1cd6ab537805337cdce +refs/heads/master: bc6cffd177f9266af38dba96a2cea06c1e7ff932 diff --git a/trunk/drivers/net/pppoe.c b/trunk/drivers/net/pppoe.c index d89ccfd6650c..bafb69b6f7cb 100644 --- a/trunk/drivers/net/pppoe.c +++ b/trunk/drivers/net/pppoe.c @@ -432,12 +432,12 @@ static int pppoe_disc_rcv(struct sk_buff *skb, if (dev_net(dev) != &init_net) goto abort; - if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) - goto abort; - if (!(skb = skb_share_check(skb, GFP_ATOMIC))) goto out; + if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) + goto abort; + ph = pppoe_hdr(skb); if (ph->code != PADT_CODE) goto abort;