diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-06-18 04:50:02 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-20 05:07:41 +0400 |
| commit | 3d7b46cd20e300bd6989fb1f43d46f1b9645816e (patch) | |
| tree | b8a063f8ecb7e380f0e1672a60815ff48c3f9b56 /net/ipv6/sit.c | |
| parent | 0e6fbc5b6c6218987c93b8c7ca60cf786062899d (diff) | |
| download | linux-3d7b46cd20e300bd6989fb1f43d46f1b9645816e.tar.xz | |
ip_tunnel: push generic protocol handling to ip_tunnel module.
Process skb tunnel header before sending packet to protocol handler.
this allows code sharing between gre and ovs gre modules.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
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, 6 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 76bb8de435b2..6cee844678e2 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -640,9 +640,14 @@ static const struct tnl_ptk_info tpi = { static int ipip_rcv(struct sk_buff *skb) { - const struct iphdr *iph = ip_hdr(skb); + const struct iphdr *iph; struct ip_tunnel *tunnel; + if (iptunnel_pull_header(skb, 0, tpi.proto)) + goto drop; + + iph = ip_hdr(skb); + tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev, iph->saddr, iph->daddr); if (tunnel != NULL) { |