diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-09 16:11:27 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-17 21:30:18 -0700 |
commit | c8c9f9a3de2c50c876b1068dd41f9a06c5749f80 (patch) | |
tree | 18cb4685232e030518d637fa7496a95bc69fc6d8 /drivers/net/ppp_generic.c | |
parent | 364c6badde0dd62a0a38e5ed67f85d87d6665780 (diff) | |
download | kernel_samsung_smdk4412-c8c9f9a3de2c50c876b1068dd41f9a06c5749f80.zip kernel_samsung_smdk4412-c8c9f9a3de2c50c876b1068dd41f9a06c5749f80.tar.gz kernel_samsung_smdk4412-c8c9f9a3de2c50c876b1068dd41f9a06c5749f80.tar.bz2 |
[NET] ppp: Remove unnecessary pskb_may_pull
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>
Diffstat (limited to 'drivers/net/ppp_generic.c')
-rw-r--r-- | drivers/net/ppp_generic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index b2073fc..01cd8ec 100644 --- a/drivers/net/ppp_generic.c +++ b/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; |