X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fnetwork.h;h=77f6a8d413a87bf6d97bb355414e597835deb853;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=591ec211a9e75938a21e3e16678cb5419c65061e;hpb=6a77f38946aaee1cd85eeec6cf4229b204c15071;p=linux-2.6.git

diff --git a/include/linux/vserver/network.h b/include/linux/vserver/network.h
index 591ec211a..77f6a8d41 100644
--- a/include/linux/vserver/network.h
+++ b/include/linux/vserver/network.h
@@ -11,6 +11,31 @@
 #define NB_IPV4ROOT	16
 
 
+/* network flags */
+
+#define NXF_INFO_PRIVATE	0x00000008
+
+#define NXF_STATE_SETUP		(1ULL<<32)
+#define NXF_STATE_ADMIN		(1ULL<<34)
+
+#define NXF_SC_HELPER		(1ULL<<36)
+#define NXF_PERSISTENT		(1ULL<<38)
+
+#define NXF_ONE_TIME		(0x0005ULL<<32)
+
+#define NXF_INIT_SET		(NXF_STATE_ADMIN)
+
+
+/* address types */
+
+#define NXA_TYPE_IPV4		1
+#define NXA_TYPE_IPV6		2
+
+#define NXA_MOD_BCAST		(1<<8)
+
+#define NXA_TYPE_ANY		((uint16_t)-1)
+
+
 #ifdef	__KERNEL__
 
 #include <linux/list.h>
@@ -21,10 +46,10 @@
 
 struct nx_info {
 	struct hlist_node nx_hlist;	/* linked list of nxinfos */
-	struct rcu_head nx_rcu;		/* the rcu head */
 	nid_t nx_id;			/* vnet id */
 	atomic_t nx_usecnt;		/* usage count */
-	atomic_t nx_refcnt;		/* reference count */
+	atomic_t nx_tasks;		/* tasks count */
+	int nx_state;			/* context state */
 
 	uint64_t nx_flags;		/* network flag word */
 	uint64_t nx_ncaps;		/* network capabilities */
@@ -43,27 +68,73 @@ struct nx_info {
 };
 
 
-struct rcu_head;
+/* status flags */
+
+#define NXS_HASHED      0x0001
+#define NXS_SHUTDOWN    0x0100
+#define NXS_RELEASED    0x8000
+
+/* check conditions */
+
+#define NX_ADMIN	0x0001
+#define NX_WATCH	0x0002
+#define NX_BLEND	0x0004
+#define NX_HOSTID	0x0008
+
+#define NX_IDENT	0x0010
+#define NX_EQUIV	0x0020
+#define NX_PARENT	0x0040
+#define NX_CHILD	0x0080
+
+#define NX_ARG_MASK	0x00F0
 
-extern void unhash_nx_info(struct nx_info *);
+#define NX_DYNAMIC	0x0100
+#define NX_STATIC	0x0200
 
-extern struct nx_info *locate_nx_info(int);
-extern struct nx_info *locate_or_create_nx_info(int);
+#define NX_ATR_MASK	0x0F00
+
+
+extern struct nx_info *lookup_nx_info(int);
 
 extern int get_nid_list(int, unsigned int *, int);
 extern int nid_is_hashed(nid_t);
 
 extern int nx_migrate_task(struct task_struct *, struct nx_info *);
 
+extern long vs_net_change(struct nx_info *, unsigned int);
+
 struct in_ifaddr;
 struct net_device;
 
+#ifdef CONFIG_INET
 int ifa_in_nx_info(struct in_ifaddr *, struct nx_info *);
 int dev_in_nx_info(struct net_device *, struct nx_info *);
 
+#else /* CONFIG_INET */
+static inline
+int ifa_in_nx_info(struct in_ifaddr *a, struct nx_info *n)
+{
+	return 1;
+}
+
+static inline
+int dev_in_nx_info(struct net_device *d, struct nx_info *n)
+{
+	return 1;
+}
+#endif /* CONFIG_INET */
+
 struct sock;
 
-int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *);
+#ifdef CONFIG_INET
+int nx_addr_conflict(struct nx_info *, uint32_t, const struct sock *);
+#else /* CONFIG_INET */
+static inline
+int nx_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
+{
+	return 1;
+}
+#endif /* CONFIG_INET */
 
 #endif	/* __KERNEL__ */
 #else	/* _VX_NETWORK_H */