| commit | 963b89e80d9fb7f22fc2688428e121b410b76504 | [log] [tgz] |
|---|---|---|
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | Wed Jun 26 17:40:33 2013 +0200 |
| committer | David S. Miller <davem@davemloft.net> | Wed Jun 26 13:42:03 2013 -0700 |
| tree | 9fe525d450947b1d943a493326612f8f27ad3dbc | |
| parent | a77471ff7069eac4f9b408509dc4c6cb61461a56 [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>