git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0-rc4
[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
..
d23961e
100644
(file)
--- a/
include/linux/vserver/network_cmd.h
+++ b/
include/linux/vserver/network_cmd.h
@@
-23,7
+23,13
@@
extern int vc_nx_info(uint32_t, void __user *);
#endif /* __KERNEL__ */
#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_migrate VC_CMD(NETMIG, 1, 0)
#define VCMD_net_add VC_CMD(NETALT, 1, 0)
@@
-37,8
+43,6
@@
struct vcmd_net_nx_v0 {
/* more to come */
};
/* more to come */
};
-// IPN_TYPE_IPV4
-
#ifdef __KERNEL__
extern int vc_net_create(uint32_t, void __user *);
#ifdef __KERNEL__
extern int vc_net_create(uint32_t, void __user *);
@@
-62,7
+66,6
@@
extern int vc_set_nflags(uint32_t, void __user *);
#define IPF_STATE_SETUP (1ULL<<32)
#define IPF_STATE_SETUP (1ULL<<32)
-
#define IPF_ONE_TIME (0x0001ULL<<32)
#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)
#define IPF_ONE_TIME (0x0001ULL<<32)
#define VCMD_get_ncaps VC_CMD(FLAGS, 7, 0)