jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

atheros: Update to build with the current driver version

Browse source
This commit is contained in:
Jouni Malinen 2010-04-17 21:04:26 +03:00
parent 2de5a860a3
commit a317d8520e
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/drivers/driver_atheros.c
View file

@ -28,34 +28,17 @@
#endif #endif
#endif /* _BYTE_ORDER */ #endif /* _BYTE_ORDER */
#include <net80211/ieee80211.h> #include "os/linux/include/ieee80211_external.h"
#include <net80211/_ieee80211.h>
#include <net80211/ieee80211_crypto.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 CONFIG_WPS
#ifdef IEEE80211_IOCTL_FILTERFRAME
#include <netpacket/packet.h> #include <netpacket/packet.h>
#ifndef ETH_P_80211_RAW #ifndef ETH_P_80211_RAW
#define ETH_P_80211_RAW 0x0019 #define ETH_P_80211_RAW 0x0019
#endif #endif
#endif /* IEEE80211_IOCTL_FILTERFRAME */
#endif /* CONFIG_WPS */ #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 "wireless_copy.h"
#include "driver.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. * swap it to match with the byte order used in WPA.
*/ */
int i; int i;
#ifndef WPA_KEY_RSC_LEN
#define WPA_KEY_RSC_LEN 8
#endif
u8 tmp[WPA_KEY_RSC_LEN]; u8 tmp[WPA_KEY_RSC_LEN];
memcpy(tmp, &wk.ik_keytsc, sizeof(wk.ik_keytsc)); memcpy(tmp, &wk.ik_keytsc, sizeof(wk.ik_keytsc));
for (i = 0; i < WPA_KEY_RSC_LEN; i++) { for (i = 0; i < WPA_KEY_RSC_LEN; i++) {

1
src/drivers/drivers.mak
View file

@ -67,6 +67,7 @@ DRV_AP_CFLAGS += -DCONFIG_DRIVER_ATHEROS
DRV_AP_OBJS += ../src/drivers/driver_atheros.o DRV_AP_OBJS += ../src/drivers/driver_atheros.o
CONFIG_L2_PACKET=linux CONFIG_L2_PACKET=linux
NEED_NETLINK=y NEED_NETLINK=y
NEED_LINUX_IOCTL=y
endif endif
##### PURE CLIENT DRIVERS ##### PURE CLIENT DRIVERS