aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2016-02-10 11:53:41 (GMT)
committerJouni Malinen <j@w1.fi>2016-02-18 15:09:14 (GMT)
commita5a3efccc2bf91444d048ebe6d95116fc3c3abdd (patch)
tree4b2f45f1bdfd5e922a0c296c99f43c97ac5cb09e /src
parenta084c24469f8da05746b19606d7d12d7b60539b6 (diff)
downloadhostap-a5a3efccc2bf91444d048ebe6d95116fc3c3abdd.zip
hostap-a5a3efccc2bf91444d048ebe6d95116fc3c3abdd.tar.gz
hostap-a5a3efccc2bf91444d048ebe6d95116fc3c3abdd.tar.bz2
Fix compile on NetBSD for vlan
Shuffle includes above system ones so to fix a compile issue on NetBSD where the if_type #define from <net/if.h> conflicts with the wpa_driver_if_type enum. Signed-off-by: Roy Marples <roy@marples.name>
Diffstat (limited to 'src')
-rw-r--r--src/ap/vlan_init.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index 8709e3d..8eab6cb 100644
--- a/src/ap/vlan_init.c
+++ b/src/ap/vlan_init.c
@@ -9,13 +9,6 @@
*/
#include "utils/includes.h"
-#include <net/if.h>
-#include <sys/ioctl.h>
-#ifdef CONFIG_FULL_DYNAMIC_VLAN
-#include <linux/sockios.h>
-#include <linux/if_vlan.h>
-#include <linux/if_bridge.h>
-#endif /* CONFIG_FULL_DYNAMIC_VLAN */
#include "utils/common.h"
#include "hostapd.h"
@@ -25,6 +18,14 @@
#include "vlan_init.h"
#include "vlan_util.h"
+#include <net/if.h>
+#include <sys/ioctl.h>
+#ifdef CONFIG_FULL_DYNAMIC_VLAN
+#include <linux/sockios.h>
+#include <linux/if_vlan.h>
+#include <linux/if_bridge.h>
+#endif /* CONFIG_FULL_DYNAMIC_VLAN */
+
#ifdef CONFIG_FULL_DYNAMIC_VLAN