summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2007-12-11 04:19:54 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:57:15 -0800
commit2aaef4e47fef8a6c0bc7fc5d9d3eea4af290e04c (patch)
treec78dfe5a76f1c19cf1167b94d623feed3f4cc9d5 /include/net
parenta0a53c8ba95451feef6c1975016f0a1eb3044ad4 (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.h6
-rw-r--r--include/net/netns/packet.h15
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 @@
#include <linux/list.h>
#include <net/netns/unix.h>
+#include <net/netns/packet.h>
struct proc_dir_entry;
struct net_device;
@@ -43,10 +44,7 @@ struct net {
struct ctl_table_header *sysctl_core_hdr;
int sysctl_somaxconn;
- /* List of all packet sockets. */
- rwlock_t packet_sklist_lock;
- struct hlist_head packet_sklist;
-
+ struct netns_packet packet;
struct netns_unix unx;
};
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 @@
+/*
+ * Packet network namespace
+ */
+#ifndef __NETNS_PACKET_H__
+#define __NETNS_PACKET_H__
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+
+struct netns_packet {
+ rwlock_t sklist_lock;
+ struct hlist_head sklist;
+};
+
+#endif /* __NETNS_PACKET_H__ */