diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-22 15:25:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-22 15:25:55 -0500 |
| commit | 242a18d1374cebacd301f6b0ce1fd70d6c5afee6 (patch) | |
| tree | b5b6079bd153f3461c92895dd7a4435cf3a80bd5 /net/ipv4 | |
| parent | f2fb4ab2a647d6576812cbb3ae1979538112f6c8 (diff) | |
| parent | 0afe21fdf6cfe0fe8a184d82a399773cc331bf40 (diff) | |
| download | op-kernel-dev-242a18d1374cebacd301f6b0ce1fd70d6c5afee6.zip op-kernel-dev-242a18d1374cebacd301f6b0ce1fd70d6c5afee6.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
This pull request is intended for net-next and contains the following changes:
1) Remove a redundant check when initializing the xfrm replay functions,
from Ulrich Weber.
2) Use a faster per-cpu helper when allocating ipcomt transforms,
from Shan Wei.
3) Use a static gc threshold value for ipv6, simmilar to what we do
for ipv4 now.
4) Remove a commented out function call.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions
