fedora core 6 1.2949 + vserver 2.2.0

[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 d23961e..fd6bdde 100644 (file)
--- a/include/linux/vserver/network_cmd.h
+++ b/include/linux/vserver/network_cmd.h
@@ -19,7 +19,7 @@ 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__ */
 
@@ -35,7 +35,7 @@ struct  vcmd_net_create {
 #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];
@@ -46,10 +46,16 @@ struct      vcmd_net_nx_v0 {
 
 #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)
 
@@ -59,14 +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)
@@ -77,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 */