[src/trunk]: src/external/bsd/wpa/dist/src fix redefinitions

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab714c8e9e7b
branches:  trunk
changeset: 820637:ab714c8e9e7b
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 12 19:15:10 2017 +0000

description:
fix redefinitions

diffstat:

 external/bsd/wpa/dist/src/common/wpa_common.h    |  3 +++
 external/bsd/wpa/dist/src/drivers/driver_bsd.c   |  5 +++--
 external/bsd/wpa/dist/src/drivers/driver_wired.c |  2 --
 external/bsd/wpa/dist/src/utils/common.h         |  4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 04c9ce39a7b0 -r ab714c8e9e7b external/bsd/wpa/dist/src/common/wpa_common.h
--- a/external/bsd/wpa/dist/src/common/wpa_common.h     Thu Jan 12 19:10:34 2017 +0000
+++ b/external/bsd/wpa/dist/src/common/wpa_common.h     Thu Jan 12 19:15:10 2017 +0000
@@ -9,6 +9,7 @@
 #ifndef WPA_COMMON_H
 #define WPA_COMMON_H
 
+
 /* IEEE 802.11i */
 #define PMKID_LEN 16
 #define PMK_LEN 32
@@ -104,7 +105,9 @@
 #define WFA_KEY_DATA_IP_ADDR_REQ RSN_SELECTOR(0x50, 0x6f, 0x9a, 4)
 #define WFA_KEY_DATA_IP_ADDR_ALLOC RSN_SELECTOR(0x50, 0x6f, 0x9a, 5)
 
+#ifndef WPA_OUI_TYPE
 #define WPA_OUI_TYPE RSN_SELECTOR(0x00, 0x50, 0xf2, 1)
+#endif
 
 #define RSN_SELECTOR_PUT(a, val) WPA_PUT_BE32((u8 *) (a), (val))
 #define RSN_SELECTOR_GET(a) WPA_GET_BE32((const u8 *) (a))
diff -r 04c9ce39a7b0 -r ab714c8e9e7b external/bsd/wpa/dist/src/drivers/driver_bsd.c
--- a/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Thu Jan 12 19:10:34 2017 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_bsd.c    Thu Jan 12 19:15:10 2017 +0000
@@ -14,8 +14,6 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "common/ieee802_11_defs.h"
-#include "common/wpa_common.h"
 
 #include <net/if.h>
 #include <net/if_media.h>
@@ -45,6 +43,9 @@
 #include <net80211/ieee80211_netbsd.h>
 #endif
 
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
+
 #include "l2_packet/l2_packet.h"
 
 struct bsd_driver_global {
diff -r 04c9ce39a7b0 -r ab714c8e9e7b external/bsd/wpa/dist/src/drivers/driver_wired.c
--- a/external/bsd/wpa/dist/src/drivers/driver_wired.c  Thu Jan 12 19:10:34 2017 +0000
+++ b/external/bsd/wpa/dist/src/drivers/driver_wired.c  Thu Jan 12 19:15:10 2017 +0000
@@ -14,8 +14,6 @@
 #include "driver.h"
 
 #include <sys/ioctl.h>
-#undef IFNAMSIZ
-#include <net/if.h>
 #ifdef __linux__
 #include <netpacket/packet.h>
 #include <net/if_arp.h>
diff -r 04c9ce39a7b0 -r ab714c8e9e7b external/bsd/wpa/dist/src/utils/common.h
--- a/external/bsd/wpa/dist/src/utils/common.h  Thu Jan 12 19:10:34 2017 +0000
+++ b/external/bsd/wpa/dist/src/utils/common.h  Thu Jan 12 19:15:10 2017 +0000
@@ -53,6 +53,10 @@
 }
 #endif /* __APPLE__ */
 
+#ifdef __NetBSD__
+#include <net/if.h>
+#endif
+
 #ifdef CONFIG_NATIVE_WINDOWS
 #include <winsock.h>