From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Oct 2013 17:51:35 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9aaf0435b4256de0723aa7631234336705fe5202;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./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>
---

9aaf0435b4256de0723aa7631234336705fe5202