From 2700519cb3ef9f85b7395a7c781fd5fa48a5570a Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@nvidia.com>
Date: Thu, 4 Jan 2024 14:42:17 -0500
Subject: [PATCH] *: Remove sys/ioctl.h from zebra.h

Practically no-one uses this and ioctls are pretty much
wrappered.  Further wrappering could make this even better.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---
 bfdd/bfd_packet.c          | 1 +
 lib/pullwr.c               | 2 ++
 lib/vrf.c                  | 1 +
 lib/zebra.h                | 1 -
 nhrpd/linux.c              | 1 +
 pimd/pim_cmd_common.c      | 1 +
 pimd/pim_mroute.c          | 1 +
 zebra/if_ioctl.c           | 1 +
 zebra/ioctl.c              | 2 ++
 zebra/zebra_mpls_openbsd.c | 1 +
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index f2596dfc3c..fec195c77e 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -12,6 +12,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #ifdef GNU_LINUX
 #include <linux/filter.h>
diff --git a/lib/pullwr.c b/lib/pullwr.c
index 3967eb5875..919a663db5 100644
--- a/lib/pullwr.c
+++ b/lib/pullwr.c
@@ -6,6 +6,8 @@
 
 #include "zebra.h"
 
+#include <sys/ioctl.h>
+
 #include "pullwr.h"
 #include "memory.h"
 #include "monotime.h"
diff --git a/lib/vrf.c b/lib/vrf.c
index 5537f71254..48071f2bd6 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #include "if.h"
 #include "vrf.h"
diff --git a/lib/zebra.h b/lib/zebra.h
index f7b7a63a44..e68cb33203 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -36,7 +36,6 @@
 #include <sys/sysctl.h>
 #endif
 #endif /* HAVE_SYS_SYSCTL_H */
-#include <sys/ioctl.h>
 #ifdef HAVE_SYS_CONF_H
 #include <sys/conf.h>
 #endif /* HAVE_SYS_CONF_H */
diff --git a/nhrpd/linux.c b/nhrpd/linux.c
index eb98166872..2a255c435c 100644
--- a/nhrpd/linux.c
+++ b/nhrpd/linux.c
@@ -7,6 +7,7 @@
 
 #include <errno.h>
 #include <linux/if_packet.h>
+#include <sys/ioctl.h>
 
 #include "nhrp_protocol.h"
 #include "os.h"
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c
index 1ea79a10ed..59addd48c0 100644
--- a/pimd/pim_cmd_common.c
+++ b/pimd/pim_cmd_common.c
@@ -6,6 +6,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #include "lib/json.h"
 #include "command.h"
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index e1b861b45b..e00888acf3 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -6,6 +6,7 @@
 
 #include <zebra.h>
 #include <netinet/icmp6.h>
+#include <sys/ioctl.h>
 
 #include "log.h"
 #include "privs.h"
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c
index b3cf865122..d0aa2167fe 100644
--- a/zebra/if_ioctl.c
+++ b/zebra/if_ioctl.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #ifdef OPEN_BSD
 
diff --git a/zebra/ioctl.c b/zebra/ioctl.c
index 8da1ae37c6..a35784cd36 100644
--- a/zebra/ioctl.c
+++ b/zebra/ioctl.c
@@ -6,6 +6,8 @@
 
 #include <zebra.h>
 
+#include <sys/ioctl.h>
+
 #include "linklist.h"
 #include "if.h"
 #include "prefix.h"
diff --git a/zebra/zebra_mpls_openbsd.c b/zebra/zebra_mpls_openbsd.c
index a696275a98..2a3ccc8065 100644
--- a/zebra/zebra_mpls_openbsd.c
+++ b/zebra/zebra_mpls_openbsd.c
@@ -4,6 +4,7 @@
  */
 
 #include <zebra.h>
+#include <sys/ioctl.h>
 
 #ifdef OPEN_BSD