diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-18 13:51:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-18 13:51:35 -0400 |
| commit | 9aaf0435b4256de0723aa7631234336705fe5202 (patch) | |
| tree | e06ee04dca7510f79ce4a5b6884970ce51b9751c /fs/ioctl.c | |
| parent | 5d6fa0992ad46163111c651052a4e00e0f4a95bf (diff) | |
| parent | ed1efb2aefbbc6f5a3da5b42158bfb753ba6fe82 (diff) | |
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>
Diffstat (limited to 'fs/ioctl.c')
0 files changed, 0 insertions, 0 deletions