diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-22 09:11:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:39 -0500 |
commit | 3b4bc4a2bfe80d01ebd4f2b6dcc58986c970ed16 (patch) | |
tree | d9dea3af7fb8fc828af0ba484c1fc06007dce351 /net/ipv4/inet_fragment.c | |
parent | e31e0bdc7e7fb9a4b09d2f3266c035a18fdcee9d (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/inet_fragment.c')
-rw-r--r-- | net/ipv4/inet_fragment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 5ab399c15282..fcf5252166fa 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c | |||
@@ -47,7 +47,7 @@ static void inet_frag_secret_rebuild(unsigned long dummy) | |||
47 | } | 47 | } |
48 | write_unlock(&f->lock); | 48 | write_unlock(&f->lock); |
49 | 49 | ||
50 | mod_timer(&f->secret_timer, now + f->ctl->secret_interval); | 50 | mod_timer(&f->secret_timer, now + f->secret_interval); |
51 | } | 51 | } |
52 | 52 | ||
53 | void inet_frags_init(struct inet_frags *f) | 53 | void inet_frags_init(struct inet_frags *f) |
@@ -65,7 +65,7 @@ void inet_frags_init(struct inet_frags *f) | |||
65 | 65 | ||
66 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, | 66 | setup_timer(&f->secret_timer, inet_frag_secret_rebuild, |
67 | (unsigned long)f); | 67 | (unsigned long)f); |
68 | f->secret_timer.expires = jiffies + f->ctl->secret_interval; | 68 | f->secret_timer.expires = jiffies + f->secret_interval; |
69 | add_timer(&f->secret_timer); | 69 | add_timer(&f->secret_timer); |
70 | } | 70 | } |
71 | EXPORT_SYMBOL(inet_frags_init); | 71 | EXPORT_SYMBOL(inet_frags_init); |