proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 11:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

macro: move network macros from utils.h

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-08-08 13:05:45 +02:00
parent 1cd9521417
commit 4fb34c047c
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lxc/macro.h
View File

@ -142,4 +142,45 @@ extern int __build_bug_on_failed;
#define prctl_arg(x) ((unsigned long)x) #define prctl_arg(x) ((unsigned long)x)
/* networking */
#ifndef IFLA_LINKMODE
#define IFLA_LINKMODE 17
#endif
#ifndef IFLA_LINKINFO
#define IFLA_LINKINFO 18
#endif
#ifndef IFLA_NET_NS_PID
#define IFLA_NET_NS_PID 19
#endif
#ifndef IFLA_INFO_KIND
#define IFLA_INFO_KIND 1
#endif
#ifndef IFLA_VLAN_ID
#define IFLA_VLAN_ID 1
#endif
#ifndef IFLA_INFO_DATA
#define IFLA_INFO_DATA 2
#endif
#ifndef VETH_INFO_PEER
#define VETH_INFO_PEER 1
#endif
#ifndef IFLA_MACVLAN_MODE
#define IFLA_MACVLAN_MODE 1
#endif
#ifndef IFLA_NEW_NETNSID
#define IFLA_NEW_NETNSID 45
#endif
#ifndef IFLA_IF_NETNSID
#define IFLA_IF_NETNSID 46
#endif
#endif /* __LXC_MACRO_H */ #endif /* __LXC_MACRO_H */

40
src/lxc/network.c
View File

@ -64,46 +64,6 @@
#include "include/strlcpy.h" #include "include/strlcpy.h"
#endif #endif
#ifndef IFLA_LINKMODE
#define IFLA_LINKMODE 17
#endif
#ifndef IFLA_LINKINFO
#define IFLA_LINKINFO 18
#endif
#ifndef IFLA_NET_NS_PID
#define IFLA_NET_NS_PID 19
#endif
#ifndef IFLA_INFO_KIND
#define IFLA_INFO_KIND 1
#endif
#ifndef IFLA_VLAN_ID
#define IFLA_VLAN_ID 1
#endif
#ifndef IFLA_INFO_DATA
#define IFLA_INFO_DATA 2
#endif
#ifndef VETH_INFO_PEER
#define VETH_INFO_PEER 1
#endif
#ifndef IFLA_MACVLAN_MODE
#define IFLA_MACVLAN_MODE 1
#endif
#ifndef IFLA_NEW_NETNSID
#define IFLA_NEW_NETNSID 45
#endif
#ifndef IFLA_IF_NETNSID
#define IFLA_IF_NETNSID 46
#endif
lxc_log_define(network, lxc); lxc_log_define(network, lxc);
typedef int (*instantiate_cb)(struct lxc_handler *, struct lxc_netdev *); typedef int (*instantiate_cb)(struct lxc_handler *, struct lxc_netdev *);