Module Name: src
Committed By: christos
Date: Thu Jan 12 19:15:10 UTC 2017
Modified Files:
src/external/bsd/wpa/dist/src/common: wpa_common.h
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c driver_wired.c
src/external/bsd/wpa/dist/src/utils: common.h
Log Message:
fix redefinitions
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/wpa/dist/src/common/wpa_common.h
cvs rdiff -u -r1.26 -r1.27 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
src/external/bsd/wpa/dist/src/drivers/driver_wired.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/utils/common.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/common/wpa_common.h
diff -u src/external/bsd/wpa/dist/src/common/wpa_common.h:1.1.1.6 src/external/bsd/wpa/dist/src/common/wpa_common.h:1.2
--- src/external/bsd/wpa/dist/src/common/wpa_common.h:1.1.1.6 Mon Nov 21 11:42:50 2016
+++ src/external/bsd/wpa/dist/src/common/wpa_common.h Thu Jan 12 14:15:10 2017
@@ -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 @@ RSN_SELECTOR(0x00, 0x0f, 0xac, 13)
#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))
Index: src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.26 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.27
--- src/external/bsd/wpa/dist/src/drivers/driver_bsd.c:1.26 Mon Nov 21 15:15:17 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_bsd.c Thu Jan 12 14:15:10 2017
@@ -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 {
Index: src/external/bsd/wpa/dist/src/drivers/driver_wired.c
diff -u src/external/bsd/wpa/dist/src/drivers/driver_wired.c:1.1.1.6 src/external/bsd/wpa/dist/src/drivers/driver_wired.c:1.2
--- src/external/bsd/wpa/dist/src/drivers/driver_wired.c:1.1.1.6 Mon Nov 21 11:42:51 2016
+++ src/external/bsd/wpa/dist/src/drivers/driver_wired.c Thu Jan 12 14:15:10 2017
@@ -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>
Index: src/external/bsd/wpa/dist/src/utils/common.h
diff -u src/external/bsd/wpa/dist/src/utils/common.h:1.4 src/external/bsd/wpa/dist/src/utils/common.h:1.5
--- src/external/bsd/wpa/dist/src/utils/common.h:1.4 Mon Nov 21 15:15:17 2016
+++ src/external/bsd/wpa/dist/src/utils/common.h Thu Jan 12 14:15:10 2017
@@ -53,6 +53,10 @@ static inline unsigned int bswap_32(unsi
}
#endif /* __APPLE__ */
+#ifdef __NetBSD__
+#include <net/if.h>
+#endif
+
#ifdef CONFIG_NATIVE_WINDOWS
#include <winsock.h>
