]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a77471f) | patch
sit: fix 4in4 + IPsec scenario
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Wed, 26 Jun 2013 15:40:33 +0000 (17:40 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jun 2013 20:42:03 +0000 (13:42 -0700)
commit963b89e80d9fb7f22fc2688428e121b410b76504
tree9fe525d450947b1d943a493326612f8f27ad3dbctree | snapshot
parenta77471ff7069eac4f9b408509dc4c6cb61461a56commit | diff
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>
net/ipv4/ip_tunnel.c diff | blob | history
Andy's Linux Kernel repo