diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-06-26 17:40:33 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-06-26 13:42:03 -0700 |
| commit | 963b89e80d9fb7f22fc2688428e121b410b76504 (patch) | |
| tree | 9fe525d450947b1d943a493326612f8f27ad3dbc /net | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next (diff) | |
| download | linux-dev-963b89e80d9fb7f22fc2688428e121b410b76504.tar.xz linux-dev-963b89e80d9fb7f22fc2688428e121b410b76504.zip | |
sit: fix 4in4 + IPsec scenario
Since commit 32b8a8e59c9c "sit: add IPv4 over IPv4 support",
tunnel->parms.iph.protocol is 0 when both 4in4 and 6in4 are setup, but
xfrm_lookup() is called only when proto is != 0, thus we need to pass the real
value.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index bd227e5ea9da..3b00d81c8f1e 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -542,7 +542,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, } rt = ip_route_output_tunnel(dev_net(dev), &fl4, - tunnel->parms.iph.protocol, + protocol, dst, tnl_params->saddr, tunnel->parms.o_key, RT_TOS(tos), |