From 131289d88de2e8e8b0147ee968cdd3e4055c3168 Mon Sep 17 00:00:00 2001
From: Masashi Honma <honma@ictec.co.jp>
Date: Thu, 21 May 2009 11:21:09 +0300
Subject: [PATCH] Fix hostapd and wpa_supplicant comipilation on NetBSD 4.0.1

---
 src/drivers/driver_bsd.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index b6b6d8e03..e1716370e 100644
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -29,10 +29,19 @@
 #else
 #include <net/ethernet.h>
 #endif
+#include <net/route.h>
 
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_crypto.h>
 #include <net80211/ieee80211_ioctl.h>
+#if __FreeBSD__
+#include <net80211/ieee80211_freebsd.h>
+#endif
+#if __NetBSD__
+#include <net80211/ieee80211_netbsd.h>
+#endif
+
+#ifdef HOSTAPD
 
 /*
  * Avoid conflicts with hostapd definitions by undefining couple of defines
@@ -42,13 +51,11 @@
 #undef WPA_VERSION
 #undef WPA_OUI_TYPE
 
-
-#ifdef HOSTAPD
-
 #include "l2_packet/l2_packet.h"
 #include "../../hostapd/hostapd.h"
 #include "../../hostapd/config.h"
 #include "../../hostapd/eapol_sm.h"
+#include "../../hostapd/sta_flags.h"
 
 struct bsd_driver_data {
 	struct hostapd_data *hapd;		/* back pointer */
@@ -541,9 +548,6 @@ no_ie:
 	return hostapd_notif_assoc(hapd, addr, iebuf, ielen);
 }
 
-#include <net/route.h>
-#include <net80211/ieee80211_freebsd.h>
-
 static void
 bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx)
 {
@@ -1203,14 +1207,6 @@ wpa_driver_bsd_scan(void *priv, const u8 *ssid, size_t ssid_len)
 	return set80211param(drv, IEEE80211_IOC_SCAN_REQ, 0);
 }
 
-#include <net/route.h>
-#if __FreeBSD__
-#include <net80211/ieee80211_freebsd.h>
-#endif
-#if __NetBSD__
-#include <net80211/ieee80211_netbsd.h>
-#endif
-
 static void
 wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx)
 {