diff mbox

Fix compile on NetBSD for vlan

Message ID 56BB24C5.7010904@marples.name
State Accepted
Headers show

Commit Message

Roy Marples Feb. 10, 2016, 11:53 a.m. UTC 
Fix compile on NetBSD for vlan
commit 1375adabdb2f3637f5714f55b85a9517581f38fd
Author: Roy Marples <roy@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@marples.name>

Comments

Jouni Malinen Feb. 18, 2016, 7:45 p.m. UTC | #1 
On Wed, Feb 10, 2016 at 11:53:41AM +0000, Roy Marples wrote:
>     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.

Thanks, applied.
diff mbox

Patch

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