Add changes from the Linux-2.6 tree.

[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 d9802fe..37c30b9 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,21 +35,36 @@ struct  vcmd_net_create {
 #define VCMD_net_add           VC_CMD(NETALT, 1, 0)
 #define VCMD_net_remove                VC_CMD(NETALT, 2, 0)
 
+#ifdef __KERNEL__
+#include <linux/in.h>
+#include <linux/in6.h>
+#else
+#include <arpa/inet.h>
+#endif /* __KERNEL__ */
+
 struct vcmd_net_addr_v0 {
        uint16_t type;
        uint16_t count;
-       uint32_t ip[4];
-       uint32_t mask[4];
+       union {
+               struct {
+                       struct in_addr ip[4];
+                       struct in_addr mask[4];
+               };
+               struct {
+                       struct in6_addr ip6;
+                       uint32_t prefix;
+               };
+       };
        /* more to come */
 };
 
 
 #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(uint32_t, void __user *);
-extern int vc_net_remove(uint32_t, void __user *);
+extern int vc_net_add(struct nx_info *, void __user *);
+extern int vc_net_remove(struct nx_info *, void __user *);
 
 #endif /* __KERNEL__ */
 
@@ -65,8 +80,8 @@ 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__ */
 
@@ -82,8 +97,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 */