summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2016-02-22 13:10:16 +0100
committerDaniel Mack <daniel@zonque.org>2016-02-22 13:22:30 +0100
commit26c34ab4eecb4a4e5166beadd393e3a4ec418d6a (patch)
tree77178595a8f5633a456b0ca4e414324446ee8626 /src/basic
parenta972e1e0b3af9dbe490c6433322c635d9e5ad875 (diff)
missing.h: Explicitly check for IFLA_BRPORT_PROXYARP
RHEL explicitly disables IFLA_BRPORT_PROXYARP by renaming the enum value. In order to support unpatched builds, we have two options: a) redefine the enum value through missing.h and ignore the fact that it is really unsupported, or b) omit that enum value on rtnl_prot_info_bridge_port_types[] As we are not actually using this netlink type anywhere, and because it is only hooked up for the sake of completeness, this patch opts for the former.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/missing.h5
1 files changed, 4 insertions, 1 deletions
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