Merge pull request #2694 from zonque/proxyarp-missing

missing.h: Explicitly check for IFLA_BRPORT_PROXYARP
2016-02-22 14:33:27 +01:00
parent 357726c8be 26c34ab4ee
commit 3535ed5949
2 changed files with 5 additions and 1 deletions
@@ -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