diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-22 06:11:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:10:39 -0800 |
| commit | 3b4bc4a2bfe80d01ebd4f2b6dcc58986c970ed16 (patch) | |
| tree | d9dea3af7fb8fc828af0ba484c1fc06007dce351 /include | |
| parent | e31e0bdc7e7fb9a4b09d2f3266c035a18fdcee9d (diff) | |
| download | linux-3b4bc4a2bfe80d01ebd4f2b6dcc58986c970ed16.tar.gz linux-3b4bc4a2bfe80d01ebd4f2b6dcc58986c970ed16.tar.xz | |
[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 'include')
| -rw-r--r-- | include/net/inet_frag.h | 6 | ||||
| -rw-r--r-- | include/net/netns/ipv6.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index de4135925490..1917fbeb362b 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -31,18 +31,14 @@ struct inet_frag_queue { #define INETFRAGS_HASHSZ 64 -struct inet_frags_ctl { - int secret_interval; -}; - struct inet_frags { struct list_head lru_list; struct hlist_head hash[INETFRAGS_HASHSZ]; rwlock_t lock; u32 rnd; int qsize; + int secret_interval; struct timer_list secret_timer; - struct inet_frags_ctl *ctl; unsigned int (*hashfn)(struct inet_frag_queue *); void (*constructor)(struct inet_frag_queue *q, diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 87ab56ab93fc..187c4248df22 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -14,7 +14,6 @@ struct netns_sysctl_ipv6 { struct ctl_table_header *table; struct ctl_table_header *frags_hdr; #endif - struct inet_frags_ctl frags; int bindv6only; int flush_delay; int ip6_rt_max_size; |