summaryrefslogtreecommitdiff
path: root/net/ipv4/fib_semantics.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-22 15:25:55 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-22 15:25:55 -0500
commit242a18d1374cebacd301f6b0ce1fd70d6c5afee6 (patch)
treeb5b6079bd153f3461c92895dd7a4435cf3a80bd5 /net/ipv4/fib_semantics.c
parentf2fb4ab2a647d6576812cbb3ae1979538112f6c8 (diff)
parent0afe21fdf6cfe0fe8a184d82a399773cc331bf40 (diff)
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/fib_semantics.c')
0 files changed, 0 insertions, 0 deletions