diff options
author | Denis V. Lunev <den@openvz.org> | 2007-12-11 07:19:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:57:15 -0500 |
commit | 2aaef4e47fef8a6c0bc7fc5d9d3eea4af290e04c (patch) | |
tree | c78dfe5a76f1c19cf1167b94d623feed3f4cc9d5 /include/net | |
parent | a0a53c8ba95451feef6c1975016f0a1eb3044ad4 (diff) |
[NETNS]: separate af_packet netns data
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 6 | ||||
-rw-r--r-- | include/net/netns/packet.h | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index d943fd4eaba5..18da0af6192f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/list.h> | 9 | #include <linux/list.h> |
10 | 10 | ||
11 | #include <net/netns/unix.h> | 11 | #include <net/netns/unix.h> |
12 | #include <net/netns/packet.h> | ||
12 | 13 | ||
13 | struct proc_dir_entry; | 14 | struct proc_dir_entry; |
14 | struct net_device; | 15 | struct net_device; |
@@ -43,10 +44,7 @@ struct net { | |||
43 | struct ctl_table_header *sysctl_core_hdr; | 44 | struct ctl_table_header *sysctl_core_hdr; |
44 | int sysctl_somaxconn; | 45 | int sysctl_somaxconn; |
45 | 46 | ||
46 | /* List of all packet sockets. */ | 47 | struct netns_packet packet; |
47 | rwlock_t packet_sklist_lock; | ||
48 | struct hlist_head packet_sklist; | ||
49 | |||
50 | struct netns_unix unx; | 48 | struct netns_unix unx; |
51 | }; | 49 | }; |
52 | 50 | ||
diff --git a/include/net/netns/packet.h b/include/net/netns/packet.h new file mode 100644 index 000000000000..637daf698884 --- /dev/null +++ b/include/net/netns/packet.h | |||
@@ -0,0 +1,15 @@ | |||
1 | /* | ||
2 | * Packet network namespace | ||
3 | */ | ||
4 | #ifndef __NETNS_PACKET_H__ | ||
5 | #define __NETNS_PACKET_H__ | ||
6 | |||
7 | #include <linux/list.h> | ||
8 | #include <linux/spinlock.h> | ||
9 | |||
10 | struct netns_packet { | ||
11 | rwlock_t sklist_lock; | ||
12 | struct hlist_head sklist; | ||
13 | }; | ||
14 | |||
15 | #endif /* __NETNS_PACKET_H__ */ | ||