X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fnetwork_cmd.h;h=fd6bddee83b6d65ffcbd9a06d60147df77ad0f1b;hb=refs%2Fheads%2Fvserver;hp=4403f549fa45296d8c709050a7c4206539b16e23;hpb=ae17e7656036804d46ec431260821023d4c8cb83;p=linux-2.6.git

diff --git a/include/linux/vserver/network_cmd.h b/include/linux/vserver/network_cmd.h
index 4403f549f..fd6bddee8 100644
--- a/include/linux/vserver/network_cmd.h
+++ b/include/linux/vserver/network_cmd.h
@@ -19,17 +19,23 @@ struct	vcmd_nx_info_v0 {
 };
 
 #ifdef	__KERNEL__
-extern int vc_nx_info(uint32_t, void __user *);
+extern int vc_nx_info(struct nx_info *, void __user *);
 
 #endif	/* __KERNEL__ */
 
-#define VCMD_net_create		VC_CMD(VNET, 1, 0)
+#define VCMD_net_create_v0	VC_CMD(VNET, 1, 0)
+#define VCMD_net_create		VC_CMD(VNET, 1, 1)
+
+struct  vcmd_net_create {
+	uint64_t flagword;
+};
+
 #define VCMD_net_migrate	VC_CMD(NETMIG, 1, 0)
 
 #define VCMD_net_add		VC_CMD(NETALT, 1, 0)
 #define VCMD_net_remove		VC_CMD(NETALT, 2, 0)
 
-struct	vcmd_net_nx_v0 {
+struct	vcmd_net_addr_v0 {
 	uint16_t type;
 	uint16_t count;
 	uint32_t ip[4];
@@ -37,15 +43,19 @@ struct	vcmd_net_nx_v0 {
 	/* more to come */
 };
 
-//	IPN_TYPE_IPV4
-
 
 #ifdef	__KERNEL__
 extern int vc_net_create(uint32_t, void __user *);
-extern int vc_net_migrate(uint32_t, void __user *);
+extern int vc_net_migrate(struct nx_info *, void __user *);
+
+extern int vc_net_add(struct nx_info *, void __user *);
+extern int vc_net_remove(struct nx_info *, void __user *);
 
 #endif	/* __KERNEL__ */
 
+
+/* flag commands */
+
 #define VCMD_get_nflags		VC_CMD(FLAGS, 5, 0)
 #define VCMD_set_nflags		VC_CMD(FLAGS, 6, 0)
 
@@ -55,15 +65,13 @@ struct	vcmd_net_flags_v0 {
 };
 
 #ifdef	__KERNEL__
-extern int vc_get_nflags(uint32_t, void __user *);
-extern int vc_set_nflags(uint32_t, void __user *);
+extern int vc_get_nflags(struct nx_info *, void __user *);
+extern int vc_set_nflags(struct nx_info *, void __user *);
 
 #endif	/* __KERNEL__ */
 
-#define IPF_STATE_SETUP		(1ULL<<32)
-
 
-#define IPF_ONE_TIME		(0x0001ULL<<32)
+/* network caps commands */
 
 #define VCMD_get_ncaps		VC_CMD(FLAGS, 7, 0)
 #define VCMD_set_ncaps		VC_CMD(FLAGS, 8, 0)
@@ -74,8 +82,8 @@ struct	vcmd_net_caps_v0 {
 };
 
 #ifdef	__KERNEL__
-extern int vc_get_ncaps(uint32_t, void __user *);
-extern int vc_set_ncaps(uint32_t, void __user *);
+extern int vc_get_ncaps(struct nx_info *, void __user *);
+extern int vc_set_ncaps(struct nx_info *, void __user *);
 
 #endif	/* __KERNEL__ */
 #endif	/* _VX_CONTEXT_CMD_H */