]> 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)
commit02bfc70c52b7ceba1d1634251f9d6c8ca8f9e6f8
treee06ee04dca7510f79ce4a5b6884970ce51b9751c
parentd782b94bd7f92fbcbd6cdd8945c98a4750a53eb5
parent412b1ca7b3fd317526a280ce05a47d45159e044a
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>