diff options
Diffstat (limited to 'include/linux/if_link.h')
| -rw-r--r-- | include/linux/if_link.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index b60ff97..8a27d5a 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -88,12 +88,12 @@ struct rtnl_link_ifmap { * * Example: * [IFLA_AF_SPEC] = { + * [AF_INET] = { + * [IFLA_INET_CONF] = ..., + * }, * [AF_INET6] = { * [IFLA_INET6_FLAGS] = ..., * [IFLA_INET6_CONF] = ..., - * }, - * [AF_BRIDGE] = { - * [IFLA_BRIDGE_PORT] = ... * } * } */ @@ -135,18 +135,14 @@ enum { IFLA_VF_PORTS, IFLA_PORT_SELF, IFLA_AF_SPEC, + IFLA_GROUP, /* Group the device belongs to */ + IFLA_NET_NS_FD, __IFLA_MAX }; #define IFLA_MAX (__IFLA_MAX - 1) -/* backwards compatibility for userspace */ -#ifndef __KERNEL__ -#define IFLA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) -#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) -#endif - enum { IFLA_INET_UNSPEC, IFLA_INET_CONF, @@ -259,6 +255,7 @@ enum macvlan_mode { MACVLAN_MODE_PRIVATE = 1, /* don't talk to other macvlans */ MACVLAN_MODE_VEPA = 2, /* talk to other ports through ext bridge */ MACVLAN_MODE_BRIDGE = 4, /* talk to bridge ports directly */ + MACVLAN_MODE_PASSTHRU = 8,/* take over the underlying device */ }; /* SR-IOV virtual function management section */ |