Skip to content

Commit

Permalink
veth: add kernel header linux/veth.h for VETH defines
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dcbw authored and thom311 committed Jul 25, 2014
1 parent 944b982 commit 9dc6e6d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
8 changes: 0 additions & 8 deletions include/linux/if_link.h
Expand Up @@ -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 {
Expand Down
12 changes: 12 additions & 0 deletions 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
1 change: 1 addition & 0 deletions lib/route/link/veth.c
Expand Up @@ -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) },
Expand Down

0 comments on commit 9dc6e6d

Please sign in to comment.