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

diff --git a/include/linux/vserver/network.h b/include/linux/vserver/network.h
index 6dfbb38e9..77f6a8d41 100644
--- a/include/linux/vserver/network.h
+++ b/include/linux/vserver/network.h
@@ -16,13 +16,14 @@
 #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		(0x0001ULL<<32)
+#define NXF_ONE_TIME		(0x0005ULL<<32)
 
-#define NXF_INIT_SET		(0)
+#define NXF_INIT_SET		(NXF_STATE_ADMIN)
 
 
 /* address types */
@@ -73,6 +74,26 @@ struct nx_info {
 #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
+
+#define NX_DYNAMIC	0x0100
+#define NX_STATIC	0x0200
+
+#define NX_ATR_MASK	0x0F00
+
+
 extern struct nx_info *lookup_nx_info(int);
 
 extern int get_nid_list(int, unsigned int *, int);
@@ -106,10 +127,10 @@ int dev_in_nx_info(struct net_device *d, struct nx_info *n)
 struct sock;
 
 #ifdef CONFIG_INET
-int nx_addr_conflict(struct nx_info *, uint32_t, struct sock *);
+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, struct sock *s)
+int nx_addr_conflict(struct nx_info *n, uint32_t a, const struct sock *s)
 {
 	return 1;
 }