Message ID | 1422454550-32222-1-git-send-email-nicolas.dichtel@6wind.com |
---|---|
State | Superseded, archived |
Delegated to: | stephen hemminger |
Headers | show |
On Wed, 28 Jan 2015 15:15:47 +0100 Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > Copy from sanitized headers. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > > v2: took last headers from net-next > > include/linux/if_link.h | 4 ++++ > include/linux/neighbour.h | 1 + > include/linux/net_namespace.h | 23 +++++++++++++++++++++++ > include/linux/rtnetlink.h | 5 +++++ > 4 files changed, 33 insertions(+) > create mode 100644 include/linux/net_namespace.h All kernel headers for iproute2 must come from the result of: $ make headers_install Please submit a patch to net-next which makes net_namespace.h (from include/uapi/linux/net_namespace.h) get correctly installed into usr/include/linux/net_namespace.h The file is missing from include/uapi/linux/Kbuild -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 05/02/2015 19:26, Stephen Hemminger a écrit : > On Wed, 28 Jan 2015 15:15:47 +0100 > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> Copy from sanitized headers. >> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> >> --- >> >> v2: took last headers from net-next >> >> include/linux/if_link.h | 4 ++++ >> include/linux/neighbour.h | 1 + >> include/linux/net_namespace.h | 23 +++++++++++++++++++++++ >> include/linux/rtnetlink.h | 5 +++++ >> 4 files changed, 33 insertions(+) >> create mode 100644 include/linux/net_namespace.h > > All kernel headers for iproute2 must come from the result of: > $ make headers_install I've done this. > > Please submit a patch to net-next which makes net_namespace.h > (from include/uapi/linux/net_namespace.h) get correctly installed into > usr/include/linux/net_namespace.h > > The file is missing from include/uapi/linux/Kbuild Hmm, I'm probably missing something (with net-next): $ git grep net_namespace.h include/uapi/linux/Kbuild include/uapi/linux/Kbuild:header-y += net_namespace.h $ rm -rf usr/include/ $ make headers_install $ find usr/include/ -name net_namespace.h usr/include/linux/net_namespace.h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 167ec34bab73..ac64724c9425 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -146,6 +146,7 @@ enum { IFLA_PHYS_PORT_ID, IFLA_CARRIER_CHANGES, IFLA_PHYS_SWITCH_ID, + IFLA_LINK_NETNSID, __IFLA_MAX }; @@ -368,6 +369,9 @@ enum { IFLA_VXLAN_UDP_CSUM, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, + IFLA_VXLAN_REMCSUM_TX, + IFLA_VXLAN_REMCSUM_RX, + IFLA_VXLAN_GBP, __IFLA_VXLAN_MAX }; #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index f3d77f9f1e0b..3873a35509aa 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h @@ -25,6 +25,7 @@ enum { NDA_VNI, NDA_IFINDEX, NDA_MASTER, + NDA_LINK_NETNSID, __NDA_MAX }; diff --git a/include/linux/net_namespace.h b/include/linux/net_namespace.h new file mode 100644 index 000000000000..9a92b7e14a19 --- /dev/null +++ b/include/linux/net_namespace.h @@ -0,0 +1,23 @@ +/* Copyright (c) 2015 6WIND S.A. + * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ +#ifndef _LINUX_NET_NAMESPACE_H_ +#define _LINUX_NET_NAMESPACE_H_ + +/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */ +enum { + NETNSA_NONE, +#define NETNSA_NSID_NOT_ASSIGNED -1 + NETNSA_NSID, + NETNSA_PID, + NETNSA_FD, + __NETNSA_MAX, +}; + +#define NETNSA_MAX (__NETNSA_MAX - 1) + +#endif /* _LINUX_NET_NAMESPACE_H_ */ diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 9111053f2250..3eb78105399b 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -132,6 +132,11 @@ enum { RTM_GETMDB = 86, #define RTM_GETMDB RTM_GETMDB + RTM_NEWNSID = 88, +#define RTM_NEWNSID RTM_NEWNSID + RTM_GETNSID = 90, +#define RTM_GETNSID RTM_GETNSID + __RTM_MAX, #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) };
Copy from sanitized headers. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- v2: took last headers from net-next include/linux/if_link.h | 4 ++++ include/linux/neighbour.h | 1 + include/linux/net_namespace.h | 23 +++++++++++++++++++++++ include/linux/rtnetlink.h | 5 +++++ 4 files changed, 33 insertions(+) create mode 100644 include/linux/net_namespace.h