[PATCH] hostapd: update driver_devicescape for current wireless-dev.git

Pavel Roskin proski at gnu.org
Fri Feb 9 19:17:23 EST 2007


Don't add kernel includes to the include path - it can cause collisions
with sanitized Linux headers used by libc.  Don't define _LINUX_TYPES_H
in CFLAGS - it should not affect drivers other than driver_devicescape,
and it can be avoided now.

Don't include net/d80211_common.h and net/d80211_shared.h - they are
gone.  Include ieee80211_common.h instead.

Copy mode enum from net/d80211.h.  Including net/d80211.h would be too
much trouble as it includes other kernel headers.

Signed-off-by: Pavel Roskin <proski at gnu.org>

--- defconfig
+++ defconfig
@@ -29,9 +29,7 @@
 # be used to set these (WIRELESS_DEV must point to the root directory of the
 # wireless-dev.git tree).
 #WIRELESS_DEV=/usr/src/wireless-dev
-#CFLAGS += -I$(WIRELESS_DEV)/include
 #CFLAGS += -I$(WIRELESS_DEV)/net/d80211
-#CFLAGS += -D_LINUX_TYPES_H
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
--- driver_devicescape.c
+++ driver_devicescape.c
@@ -38,11 +38,20 @@
 #include "sta_info.h"
 #include "hw_features.h"
 #include <hostapd_ioctl.h>
-#include <net/d80211_common.h>
-#include <net/d80211_shared.h>
+#include <ieee80211_common.h>
 #include "mlme.h"
 
 
+/* Copied from net/d80211.h */
+enum {
+	MODE_IEEE80211A = 0 /* IEEE 802.11a */,
+	MODE_IEEE80211B = 1 /* IEEE 802.11b only */,
+	MODE_ATHEROS_TURBO = 2 /* Atheros Turbo mode (2x.11a at 5 GHz) */,
+	MODE_IEEE80211G = 3 /* IEEE 802.11g (and 802.11b compatibility) */,
+	MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
+	NUM_IEEE80211_MODES = 5
+};
+
 struct i802_driver_data {
 	struct driver_ops ops;
 	struct hostapd_data *hapd;


-- 
Regards,
Pavel Roskin




More information about the HostAP mailing list