]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Oct 2013 17:51:35 +0000 (13:51 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Oct 2013 17:51:35 +0000 (13:51 -0400)
commitbc56d24cd4bb50b952aaf2e50291443e2beac6d6
treee06ee04dca7510f79ce4a5b6884970ce51b9751c
parent1b8429b969ed9471667c5097954d4d73088474c4
parent362a48aabff4077d289bdf97f6ab8a0d98001bd8
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
1) Don't use a wildcard SA if a more precise one is in acquire state,
   from Fan Du.

2) Simplify the SA lookup when using wildcard source. We need to check
   only the destination in this case, from Fan Du.

3) Add a receive path hook for IPsec virtual tunnel interfaces
   to xfrm6_mode_tunnel.

4) Add support for IPsec virtual tunnel interfaces to ipv6.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>