aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2003-07-04 00:42:46 (GMT)
committerJouni Malinen <j@w1.fi>2003-07-04 00:42:46 (GMT)
commit39056a17200654ffa5c343f77d0cc1da3649a9c2 (patch)
tree11117aaf3c325c97fb0f0febf73bec1c257ebdca
parent43f48467d2a291cd3db10f68e2ffa25a5b8a8b2b (diff)
downloadhostap-history-39056a17200654ffa5c343f77d0cc1da3649a9c2.zip
hostap-history-39056a17200654ffa5c343f77d0cc1da3649a9c2.tar.gz
hostap-history-39056a17200654ffa5c343f77d0cc1da3649a9c2.tar.bz2
Do not include linux/wireless.h if CONFIG_NET_RADIO is not set.
Use iw_mode module param even without WIRELESS_EXT. Patch from Pavel Roskin.
-rw-r--r--driver/modules/hostap_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/modules/hostap_hw.c b/driver/modules/hostap_hw.c
index cb24ec6..34adb32 100644
--- a/driver/modules/hostap_hw.c
+++ b/driver/modules/hostap_hw.c
@@ -45,10 +45,12 @@
#include <linux/random.h>
#include <linux/wait.h>
#include <linux/sched.h>
+#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
#include <linux/wireless.h>
#if WIRELESS_EXT > 12
#include <net/iw_handler.h>
#endif /* WIRELESS_EXT > 12 */
+#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
#include <asm/irq.h>
@@ -3265,7 +3267,6 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx)
memcpy(local->essid, essid[i],
len > MAX_SSID_LEN ? MAX_SSID_LEN : len);
local->essid[MAX_SSID_LEN] = '\0';
-#ifdef WIRELESS_EXT
i = GET_INT_PARM(iw_mode, card_idx);
if ((i >= IW_MODE_ADHOC && i <= IW_MODE_REPEAT) ||
i == IW_MODE_MONITOR) {
@@ -3275,7 +3276,6 @@ prism2_init_local_data(struct prism2_helper_functions *funcs, int card_idx)
"IW_MODE_MASTER\n", i);
local->iw_mode = IW_MODE_MASTER;
}
-#endif
local->channel = GET_INT_PARM(channel, card_idx);
local->beacon_int = GET_INT_PARM(beacon_int, card_idx);
local->dtim_period = GET_INT_PARM(dtim_period, card_idx);