aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_fragment.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-01-22 09:11:04 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:39 -0500
commit3b4bc4a2bfe80d01ebd4f2b6dcc58986c970ed16 (patch)
treed9dea3af7fb8fc828af0ba484c1fc06007dce351 /net/ipv4/ip_fragment.c
parente31e0bdc7e7fb9a4b09d2f3266c035a18fdcee9d (diff)
[NETNS][FRAGS]: Isolate the secret interval from namespaces.
Since we have one hashtable to lookup the fragment, having different secret_interval-s for hash rebuild doesn't make sense, so move this one to inet_frags. The inet_frags_ctl becomes empty after this, so remove it. The appropriate ctl table is kept read-only in namespaces. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_fragment.c')
-rw-r--r--net/ipv4/ip_fragment.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 80c2c19196cd..00646ed451f5 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -74,10 +74,6 @@ struct ipq {
74 struct inet_peer *peer; 74 struct inet_peer *peer;
75}; 75};
76 76
77static struct inet_frags_ctl ip4_frags_ctl __read_mostly = {
78 .secret_interval = 10 * 60 * HZ,
79};
80
81static struct inet_frags ip4_frags; 77static struct inet_frags ip4_frags;
82 78
83int ip_frag_nqueues(struct net *net) 79int ip_frag_nqueues(struct net *net)
@@ -627,7 +623,7 @@ static struct ctl_table ip4_frags_ctl_table[] = {
627 { 623 {
628 .ctl_name = NET_IPV4_IPFRAG_SECRET_INTERVAL, 624 .ctl_name = NET_IPV4_IPFRAG_SECRET_INTERVAL,
629 .procname = "ipfrag_secret_interval", 625 .procname = "ipfrag_secret_interval",
630 .data = &ip4_frags_ctl.secret_interval, 626 .data = &ip4_frags.secret_interval,
631 .maxlen = sizeof(int), 627 .maxlen = sizeof(int),
632 .mode = 0644, 628 .mode = 0644,
633 .proc_handler = &proc_dointvec_jiffies, 629 .proc_handler = &proc_dointvec_jiffies,
@@ -720,7 +716,6 @@ static int ipv4_frags_init_net(struct net *net)
720void __init ipfrag_init(void) 716void __init ipfrag_init(void)
721{ 717{
722 ipv4_frags_init_net(&init_net); 718 ipv4_frags_init_net(&init_net);
723 ip4_frags.ctl = &ip4_frags_ctl;
724 ip4_frags.hashfn = ip4_hashfn; 719 ip4_frags.hashfn = ip4_hashfn;
725 ip4_frags.constructor = ip4_frag_init; 720 ip4_frags.constructor = ip4_frag_init;
726 ip4_frags.destructor = ip4_frag_free; 721 ip4_frags.destructor = ip4_frag_free;
@@ -728,6 +723,7 @@ void __init ipfrag_init(void)
728 ip4_frags.qsize = sizeof(struct ipq); 723 ip4_frags.qsize = sizeof(struct ipq);
729 ip4_frags.match = ip4_frag_match; 724 ip4_frags.match = ip4_frag_match;
730 ip4_frags.frag_expire = ip_expire; 725 ip4_frags.frag_expire = ip_expire;
726 ip4_frags.secret_interval = 10 * 60 * HZ;
731 inet_frags_init(&ip4_frags); 727 inet_frags_init(&ip4_frags);
732} 728}
733 729