From: Vyatta Package Maintainers <DL-vyatta-help@att.com>
Date: Tue, 23 Mar 2021 14:25:52 +0000
Subject: buster-update

---
 bridge_ctl.h   |  3 ++-
 bridge_track.c |  3 +--
 brmon.c        | 21 ++-------------------
 ctl_main.c     |  1 +
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/bridge_ctl.h b/bridge_ctl.h
index d09a8b4..79720f5 100644
--- a/bridge_ctl.h
+++ b/bridge_ctl.h
@@ -28,7 +28,8 @@
 #define BRIDGE_CTL_H
 
 #include <stdbool.h>
-#include <net/if.h>
+#include <sys/socket.h>
+#include <linux/if.h>
 #include <linux/if_ether.h>
 
 typedef struct
diff --git a/bridge_track.c b/bridge_track.c
index 2f23923..12a61a8 100644
--- a/bridge_track.c
+++ b/bridge_track.c
@@ -29,9 +29,8 @@
 #include <fcntl.h>
 #include <linux/param.h>
 #include <netinet/in.h>
-#include <linux/if_bridge.h>
 #include <asm/byteorder.h>
-#include <net/if.h>
+#include <linux/if.h>
 #include <linux/llc.h>
 
 #include "bridge_track.h"
diff --git a/brmon.c b/brmon.c
index aa7e3b7..3dbc112 100644
--- a/brmon.c
+++ b/brmon.c
@@ -17,6 +17,8 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <netinet/in.h>
+#include <net/if.h>
+#include <linux/if.h>
 #include <linux/if_bridge.h>
 
 #include "log.h"
@@ -25,25 +27,6 @@
 #include "netif_utils.h"
 #include "epoll_loop.h"
 
-/* RFC 2863 operational status */
-enum
-{
-    IF_OPER_UNKNOWN,
-    IF_OPER_NOTPRESENT,
-    IF_OPER_DOWN,
-    IF_OPER_LOWERLAYERDOWN,
-    IF_OPER_TESTING,
-    IF_OPER_DORMANT,
-    IF_OPER_UP,
-};
-
-/* link modes */
-enum
-{
-    IF_LINK_MODE_DEFAULT,
-    IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */
-};
-
 static const char *port_states[] =
 {
     [BR_STATE_DISABLED] = "disabled",
diff --git a/ctl_main.c b/ctl_main.c
index 771d59e..f50a643 100644
--- a/ctl_main.c
+++ b/ctl_main.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <net/if.h>
 
 #include "ctl_socket_client.h"
 #include "log.h"
