diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-07-25 19:27:09 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-07-25 20:37:41 (GMT) |
| commit | 9dc6e6da90016a33929f262bea0187396e1a061b (patch) | |
| tree | 6ff6384b7c3866b08fb368cf773ad2a0db7007fa | |
| parent | 944b982cc50efd1fd478f5544b4e5e963af30214 (diff) | |
| download | libnl-9dc6e6da90016a33929f262bea0187396e1a061b.zip libnl-9dc6e6da90016a33929f262bea0187396e1a061b.tar.gz libnl-9dc6e6da90016a33929f262bea0187396e1a061b.tar.bz2 | |
veth: add kernel header linux/veth.h for VETH defines
Similar to what's done with <linux/if_link.h>, make sure used defines
actually exist. Otherwise building on even slightly older kernels
fails.
Taken from upstream kernel commit 1860e379875dfe7271c649058aeddffe5afd9d0d
(tag: v3.15), file 'include/uapi/linux/veth.h'.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | include/linux/if_link.h | 8 | ||||
| -rw-r--r-- | include/linux/veth.h | 12 | ||||
| -rw-r--r-- | lib/route/link/veth.c | 1 |
3 files changed, 13 insertions, 8 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 8b84939..8119dc2 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -313,14 +313,6 @@ struct ifla_vxlan_port_range { __be16 high; }; -enum { - VETH_INFO_UNSPEC, - VETH_INFO_PEER, - - __VETH_INFO_MAX -#define VETH_INFO_MAX (__VETH_INFO_MAX - 1) -}; - /* SR-IOV virtual function management section */ enum { diff --git a/include/linux/veth.h b/include/linux/veth.h new file mode 100644 index 0000000..3354c1e --- /dev/null +++ b/include/linux/veth.h @@ -0,0 +1,12 @@ +#ifndef __NET_VETH_H_ +#define __NET_VETH_H_ + +enum { + VETH_INFO_UNSPEC, + VETH_INFO_PEER, + + __VETH_INFO_MAX +#define VETH_INFO_MAX (__VETH_INFO_MAX - 1) +}; + +#endif diff --git a/lib/route/link/veth.c b/lib/route/link/veth.c index e7e4a26..1c5b125 100644 --- a/lib/route/link/veth.c +++ b/lib/route/link/veth.c @@ -32,6 +32,7 @@ #include <netlink/route/link/veth.h> #include <linux/if_link.h> +#include <linux/veth.h> static struct nla_policy veth_policy[VETH_INFO_MAX+1] = { [VETH_INFO_PEER] = { .minlen = sizeof(struct ifinfomsg) }, |