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;