diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-01-18 09:18:17 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-18 14:43:51 -0500 |
| commit | 1ad759d8479b4b28f2a6c874d380066cf987b341 (patch) | |
| tree | a30e292dd8495d922c563ba8aa9438c686b85380 /net/ipv6/sit.c | |
| parent | 115b0aa6b444e8dd89b7f67b77b8c472763fbc1a (diff) | |
| download | linux-3.10-1ad759d8479b4b28f2a6c874d380066cf987b341.tar.gz linux-3.10-1ad759d8479b4b28f2a6c874d380066cf987b341.tar.bz2 linux-3.10-1ad759d8479b4b28f2a6c874d380066cf987b341.zip | |
ipv6: remove unneeded check to pskb_may_pull in ipip6_rcv
This is already checked by the caller (tunnel64_rcv) and brings ipip6_rcv
in line with ipip_rcv.
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index cfba99b2c2a..98fe53694a6 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -592,15 +592,10 @@ out: static int ipip6_rcv(struct sk_buff *skb) { - const struct iphdr *iph; + const struct iphdr *iph = ip_hdr(skb); struct ip_tunnel *tunnel; int err; - if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) - goto out; - - iph = ip_hdr(skb); - tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev, iph->saddr, iph->daddr); if (tunnel != NULL) { |