diff options
author | Denis V. Lunev <den@openvz.org> | 2007-12-11 07:19:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:14 -0500 |
commit | a0a53c8ba95451feef6c1975016f0a1eb3044ad4 (patch) | |
tree | 0b64ce018878cbaa0bf5cdfa308d4a7e71218914 /include/net/net_namespace.h | |
parent | 27147c9e6e8316af91dea487aa2c14b18dcff4cf (diff) |
[NETNS]: struct net content re-work (v3)
Recently David Miller and Herbert Xu pointed out that struct net becomes
overbloated and un-maintainable. There are two solutions:
- provide a pointer to a network subsystem definition from struct net.
This costs an additional dereferrence
- place sub-system definition into the structure itself. This will speedup
run-time access at the cost of recompilation time
The second approach looks better for us. Other sub-systems will follow.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/net_namespace.h')
-rw-r--r-- | include/net/net_namespace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index b62e31fca474..d943fd4eaba5 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -8,6 +8,8 @@ | |||
8 | #include <linux/workqueue.h> | 8 | #include <linux/workqueue.h> |
9 | #include <linux/list.h> | 9 | #include <linux/list.h> |
10 | 10 | ||
11 | #include <net/netns/unix.h> | ||
12 | |||
11 | struct proc_dir_entry; | 13 | struct proc_dir_entry; |
12 | struct net_device; | 14 | struct net_device; |
13 | struct sock; | 15 | struct sock; |
@@ -45,9 +47,7 @@ struct net { | |||
45 | rwlock_t packet_sklist_lock; | 47 | rwlock_t packet_sklist_lock; |
46 | struct hlist_head packet_sklist; | 48 | struct hlist_head packet_sklist; |
47 | 49 | ||
48 | /* unix sockets */ | 50 | struct netns_unix unx; |
49 | int sysctl_unix_max_dgram_qlen; | ||
50 | struct ctl_table_header *unix_ctl; | ||
51 | }; | 51 | }; |
52 | 52 | ||
53 | #ifdef CONFIG_NET | 53 | #ifdef CONFIG_NET |