[PATCH] Fix compile on NetBSD for vlan
Roy Marples
roy at marples.name
Wed Feb 10 03:53:41 PST 2016
Fix compile on NetBSD for vlan
-------------- next part --------------
commit 1375adabdb2f3637f5714f55b85a9517581f38fd
Author: Roy Marples <roy at marples.name>
Date: Wed Feb 10 11:50:10 2016 +0000
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 at marples.name>
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index e3df164..c5f2a1d 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
More information about the Hostap
mailing list