summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-22 14:33:27 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-22 14:33:27 +0100
commit3535ed594940e5959c2a33ebfa1216fe603188e0 (patch)
tree92685486c110541b468de6daaa34909687a9165c
parent357726c8be397711fb195b3995eee5891326d8e4 (diff)
parent26c34ab4eecb4a4e5166beadd393e3a4ec418d6a (diff)
Merge pull request #2694 from zonque/proxyarp-missing
missing.h: Explicitly check for IFLA_BRPORT_PROXYARP
-rw-r--r--configure.ac1
-rw-r--r--src/basic/missing.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f51533c2b3..269aceddcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,6 +323,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
IFLA_IPTUN_ENCAP_DPORT,
IFLA_GRE_ENCAP_DPORT,
IFLA_BRIDGE_VLAN_INFO,
+ IFLA_BRPORT_PROXYARP,
IFLA_BRPORT_LEARNING_SYNC,
IFLA_BR_PRIORITY,
NDA_IFINDEX,
diff --git a/src/basic/missing.h b/src/basic/missing.h
index f3d32362bd..88ecb4ac01 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -883,13 +883,16 @@ static inline int setns(int fd, int nstype) {
#define IFLA_BRPORT_FAST_LEAVE 7
#define IFLA_BRPORT_LEARNING 8
#define IFLA_BRPORT_UNICAST_FLOOD 9
-#define IFLA_BRPORT_PROXYARP 10
#define IFLA_BRPORT_LEARNING_SYNC 11
#define __IFLA_BRPORT_MAX 12
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
#endif
+#if !HAVE_DECL_IFLA_BRPORT_PROXYARP
+#define IFLA_BRPORT_PROXYARP 10
+#endif
+
#if !HAVE_DECL_NDA_IFINDEX
#define NDA_UNSPEC 0
#define NDA_DST 1