diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-24 18:13:33 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-24 18:13:33 -0500 |
| commit | 1f5a7407e4307bfaa465fbaece985a72e4bc4752 (patch) | |
| tree | dee858795c6541bd387215445b7b05c49bb673f6 /MAINTAINERS | |
| parent | 3b5c8ab11553d0f5b2f6182f02e2e70f5dcf4dc6 (diff) | |
| parent | cc9ab60e57964d463ff31b9621c8d7e786aee042 (diff) | |
| download | linux-1f5a7407e4307bfaa465fbaece985a72e4bc4752.tar.gz linux-1f5a7407e4307bfaa465fbaece985a72e4bc4752.tar.bz2 linux-1f5a7407e4307bfaa465fbaece985a72e4bc4752.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Introduce skb_to_sgvec_nomark function to add further data to the sg list
without calling sg_unmark_end first. Needed to add extended sequence
number informations. From Fan Du.
2) Add IPsec extended sequence numbers support to the Authentication Header
protocol for ipv4 and ipv6. From Fan Du.
3) Make the IPsec flowcache namespace aware, from Fan Du.
4) Avoid creating temporary SA for every packet when no key manager is
registered. From Horia Geanta.
5) Support filtering of SA dumps to show only the SAs that match a
given filter. From Nicolas Dichtel.
6) Remove caching of xfrm_policy_sk_bundles. The cached socket policy bundles
are never used, instead we create a new cache entry whenever xfrm_lookup()
is called on a socket policy. Most protocols cache the used routes to the
socket, so this caching is not needed.
7) Fix a forgotten SADB_X_EXT_FILTER length check in pfkey, from Nicolas
Dichtel.
8) Cleanup error handling of xfrm_state_clone.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index db8bb0d2379e..b0196ab3e489 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6009,6 +6009,7 @@ L: netdev@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git S: Maintained +F: net/core/flow.c F: net/xfrm/ F: net/key/ F: net/ipv4/xfrm* |