upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / include / linux / vserver / network_cmd.h

diff --git a/include/linux/vserver/network_cmd.h b/include/linux/vserver/network_cmd.h
index 4403f54..d9802fe 100644 (file)
--- a/include/linux/vserver/network_cmd.h
+++ b/include/linux/vserver/network_cmd.h
@@ -23,13 +23,19 @@ extern int vc_nx_info(uint32_t, 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_add(uint32_t, void __user *);
+extern int vc_net_remove(uint32_t, void __user *);
+
 #endif /* __KERNEL__ */
 
+
+/* flag commands */
+
 #define VCMD_get_nflags                VC_CMD(FLAGS, 5, 0)
 #define VCMD_set_nflags                VC_CMD(FLAGS, 6, 0)
 
@@ -60,10 +70,8 @@ extern int vc_set_nflags(uint32_t, 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)