From: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Date: Fri, 17 Apr 2020 18:37:42 +0000 (-0700)
Subject: zebra: remove linux/ifbridge.h from rt_netlink.c
X-Git-Tag: base_7.5~116^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d87ed8d74a9a12039c84480d1075206c1d8a67ca;p=matthieu%2Ffrr.git

zebra: remove linux/ifbridge.h from rt_netlink.c

It is causing build failures because of conflicts with netinet.
Instead I have re-defined the MAC-SYNC UAPIs in the re_netlink.c

This is clearly a hack that needs to be re-visited.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index d571d7f5e3..61d1212e04 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -23,7 +23,6 @@
 #ifdef HAVE_NETLINK
 
 #include <net/if_arp.h>
-#include <linux/if_bridge.h>
 #include <linux/lwtunnel.h>
 #include <linux/mpls_iptunnel.h>
 #include <linux/neighbour.h>
@@ -75,6 +74,21 @@
 #define AF_MPLS 28
 #endif
 
+/* Re-defining as I am unable to include <linux/if_bridge.h> which has the
+ * UAPI for MAC sync. */
+#ifndef _UAPI_LINUX_IF_BRIDGE_H
+/* FDB notification bits for NDA_NOTIFY:
+ * - BR_FDB_NFY_STATIC - notify on activity/expire even for a static entry
+ * - BR_FDB_NFY_INACTIVE - mark as inactive to avoid double notification,
+ *                         used with BR_FDB_NFY_STATIC (kernel controlled)
+ */
+enum {
+	BR_FDB_NFY_STATIC,
+	BR_FDB_NFY_INACTIVE,
+	BR_FDB_NFY_MAX
+};
+#endif
+
 static vlanid_t filter_vlan = 0;
 
 /* We capture whether the current kernel supports nexthop ids; by