From a317d8520e64c38980f054d7daf86debd0ed7b79 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Sat, 17 Apr 2010 21:04:26 +0300
Subject: [PATCH] atheros: Update to build with the current driver version

---
 src/drivers/driver_atheros.c | 22 ++++------------------
 src/drivers/drivers.mak      |  1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c
index f718857b7..d1cd3f759 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++) {
diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak
index 91cd244d8..b76b22953 100644
--- a/src/drivers/drivers.mak
+++ b/src/drivers/drivers.mak
@@ -67,6 +67,7 @@ DRV_AP_CFLAGS += -DCONFIG_DRIVER_ATHEROS
 DRV_AP_OBJS += ../src/drivers/driver_atheros.o
 CONFIG_L2_PACKET=linux
 NEED_NETLINK=y
+NEED_LINUX_IOCTL=y
 endif
 
 ##### PURE CLIENT DRIVERS