aboutsummaryrefslogtreecommitdiffstats
path: root/src/drivers/driver_atheros.c
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2010-04-17 18:04:26 (GMT)
committerJouni Malinen <j@w1.fi>2010-04-17 18:04:26 (GMT)
commita317d8520e64c38980f054d7daf86debd0ed7b79 (patch)
treea4a217a8cd6a0aab71fabfdcc08f629cb7076fff /src/drivers/driver_atheros.c
parent2de5a860a39cbb85f87a5c58cf86ecdf2b1af706 (diff)
downloadhostap-a317d8520e64c38980f054d7daf86debd0ed7b79.zip
hostap-a317d8520e64c38980f054d7daf86debd0ed7b79.tar.gz
hostap-a317d8520e64c38980f054d7daf86debd0ed7b79.tar.bz2
atheros: Update to build with the current driver version
Diffstat (limited to 'src/drivers/driver_atheros.c')
-rw-r--r--src/drivers/driver_atheros.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index f718857..d1cd3f7 100644
--- a/src/drivers/driver_atheros.c
+++ b/src/drivers/driver_atheros.c
@@ -28,34 +28,17 @@
#endif
#endif /* _BYTE_ORDER */
-#include <net80211/ieee80211.h>
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
+#include "os/linux/include/ieee80211_external.h"
-/*
- * Note, the ATH_WPS_IE setting must match with the driver build.. If the
- * driver does not include this, the IEEE80211_IOCTL_GETWPAIE ioctl will fail.
- */
-#define ATH_WPS_IE
-#include <net80211/ieee80211_ioctl.h>
#ifdef CONFIG_WPS
-#ifdef IEEE80211_IOCTL_FILTERFRAME
#include <netpacket/packet.h>
#ifndef ETH_P_80211_RAW
#define ETH_P_80211_RAW 0x0019
#endif
-#endif /* IEEE80211_IOCTL_FILTERFRAME */
#endif /* CONFIG_WPS */
-/*
- * Avoid conflicts with hostapd definitions by undefining couple of defines
- * from madwifi header files.
- */
-#undef WPA_OUI_TYPE
-#undef WME_OUI_TYPE
-
#include "wireless_copy.h"
#include "driver.h"
@@ -473,6 +456,9 @@ madwifi_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx,
* swap it to match with the byte order used in WPA.
*/
int i;
+#ifndef WPA_KEY_RSC_LEN
+#define WPA_KEY_RSC_LEN 8
+#endif
u8 tmp[WPA_KEY_RSC_LEN];
memcpy(tmp, &wk.ik_keytsc, sizeof(wk.ik_keytsc));
for (i = 0; i < WPA_KEY_RSC_LEN; i++) {