diff options
author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-01-18 04:18:17 -0500 |
---|---|---|
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) |
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 cfba99b2c2a4..98fe53694a65 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -592,15 +592,10 @@ out: | |||
592 | 592 | ||
593 | static int ipip6_rcv(struct sk_buff *skb) | 593 | static int ipip6_rcv(struct sk_buff *skb) |
594 | { | 594 | { |
595 | const struct iphdr *iph; | 595 | const struct iphdr *iph = ip_hdr(skb); |
596 | struct ip_tunnel *tunnel; | 596 | struct ip_tunnel *tunnel; |
597 | int err; | 597 | int err; |
598 | 598 | ||
599 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) | ||
600 | goto out; | ||
601 | |||
602 | iph = ip_hdr(skb); | ||
603 | |||
604 | tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev, | 599 | tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev, |
605 | iph->saddr, iph->daddr); | 600 | iph->saddr, iph->daddr); |
606 | if (tunnel != NULL) { | 601 | if (tunnel != NULL) { |