]> err.no Git - linux-2.6/commitdiff
[NET] ppp: Remove unnecessary pskb_may_pull
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 9 Jun 2006 23:11:27 +0000 (16:11 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Sun, 18 Jun 2006 04:30:18 +0000 (21:30 -0700)
In ppp_receive_nonmp_frame, we call pskb_may_pull(skb, skb->len) if the
tailroom is >= 124.  This is pointless because this pskb_may_pull is only
needed if the skb is non-linear.  However, if it is non-linear then the
tailroom would be zero.

So it can be safely removed.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ppp_generic.c

index b2073fce82169fa41f97a4e21bf2dde453f3ccd4..01cd8ec751ea4b7b5b6d023257776725b22f3907 100644 (file)
@@ -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;