[PATCH] NetBSD: Fix compile

Roy Marples roy at marples.name
Thu Sep 19 02:59:09 PDT 2019


     On NetBSD the ethernet header is net/if_ether.h

     This also pulls in net/if.h which defines if_type, which in turn
     conflicts with an enum in wpa_supplicant. As such we need to
     include this at the bottom rather than at the top.

     Signed-off-by: Roy Marples <roy at marples.name>

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 6ed6837b3..65d027153 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -11,9 +11,6 @@
  #include <netinet/ip.h>
  #endif /* CONFIG_TESTING_OPTIONS */

-#if !defined(__CYGWIN__) && !defined(CONFIG_NATIVE_WINDOWS)
-#include <net/ethernet.h>
-#endif
  #include "utils/common.h"
  #include "utils/eloop.h"
  #include "utils/uuid.h"
@@ -60,6 +57,12 @@
  #include "dpp_supplicant.h"
  #include "sme.h"

+#ifdef __NetBSD__
+#include <net/if_ether.h>
+#elif !defined(__CYGWIN__) && !defined(CONFIG_NATIVE_WINDOWS)
+#include <net/ethernet.h>
+#endif
+



More information about the Hostap mailing list