summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-22 15:24:30 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-22 15:24:30 -0500
commit5e7873d1450e1809b017b943417530db3955ac5f (patch)
treeeee7e724fa10e0cccb5f10707bce247d7eba721b /include
parentef6c5be658f6a70c1256fbd18e18ee0dc24c3386 (diff)
parent703fb94ec58e0e8769380c2877a8a34aeb5b6c97 (diff)
downloadlinux-5e7873d1450e1809b017b943417530db3955ac5f.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== This pull request is intended for 3.7 and contains a single patch to fix the IPsec gc threshold value for ipv4. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/xfrm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6f0ba01afe73..63445ede48bb 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1351,7 +1351,7 @@ struct xfrm6_tunnel {
};
extern void xfrm_init(void);
-extern void xfrm4_init(int rt_hash_size);
+extern void xfrm4_init(void);
extern int xfrm_state_init(struct net *net);
extern void xfrm_state_fini(struct net *net);
extern void xfrm4_state_init(void);