aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2003-07-12 13:40:30 (GMT)
committerJouni Malinen <j@w1.fi>2003-07-12 13:40:30 (GMT)
commitbd20ece5eb96d8d4e0682a0a98ccf203ad31cb97 (patch)
treefe0e04019b0d31363103e3b8cfaf9fe0df87f10f
parent0caad4e3ffcc4aa4494224681b1dee8795f668ae (diff)
downloadhostap-history-bd20ece5eb96d8d4e0682a0a98ccf203ad31cb97.zip
hostap-history-bd20ece5eb96d8d4e0682a0a98ccf203ad31cb97.tar.gz
hostap-history-bd20ece5eb96d8d4e0682a0a98ccf203ad31cb97.tar.bz2
Added support for selection which authentication algorithm to use in
station mode (prism2_param 'ap_auth_algs', 1 = open system, 2 = shared key (requires WEP), 3 = both, default) (ap_auth_algs was previously used only in AP/Master mode, but it is now also used for STA mode configuration).
-rw-r--r--ChangeLog5
-rw-r--r--driver/modules/hostap_hw.c6
-rw-r--r--driver/modules/hostap_ioctl.c3
-rw-r--r--todo.lst4
4 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fe042ce..d56e721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@ ChangeLog for Host AP driver for Intersil Prism2/2.5/3
to avoid sending out Beacon and ProbeResp frames
* fixed enh_sec setting (hide SSID) to reset Port0 so that the changes
to the beacon are taken into use immediately
+ * added support for selection which authentication algorithm to use
+ in station mode (prism2_param 'ap_auth_algs', 1 = open system,
+ 2 = shared key (requires WEP), 3 = both, default)
+ (ap_auth_algs was previously used only in AP/Master mode, but it is
+ now also used for STA mode configuration)
2003-05-18 - v0.0.3
* redesigned RADIUS client implementation
diff --git a/driver/modules/hostap_hw.c b/driver/modules/hostap_hw.c
index a321be7..d40e4a1 100644
--- a/driver/modules/hostap_hw.c
+++ b/driver/modules/hostap_hw.c
@@ -1010,6 +1010,12 @@ static int prism2_setup_rids(struct net_device *dev)
printk(KERN_INFO "%s: cnfEnhSecurity setting to 0x%x failed\n",
dev->name, local->enh_sec);
+ if (local->ap &&
+ hostap_set_word(dev, HFA384X_RID_CNFAUTHENTICATION,
+ local->ap->auth_algs))
+ printk(KERN_INFO "%s: cnfAuthentication setting to 0x%x "
+ "failed\n", dev->name, local->ap->auth_algs);
+
fail:
return ret;
}
diff --git a/driver/modules/hostap_ioctl.c b/driver/modules/hostap_ioctl.c
index 243b6b8..715b241 100644
--- a/driver/modules/hostap_ioctl.c
+++ b/driver/modules/hostap_ioctl.c
@@ -2094,6 +2094,9 @@ static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
case PRISM2_PARAM_AP_AUTH_ALGS:
if (local->ap != NULL)
local->ap->auth_algs = value;
+ if (hostap_set_word(dev, HFA384X_RID_CNFAUTHENTICATION, value))
+ printk(KERN_WARNING "%s: failed to set auth algs for "
+ "STA mode\n", dev->name);
break;
case PRISM2_PARAM_MONITOR_ALLOW_FCSERR:
diff --git a/todo.lst b/todo.lst
index 8e90daf..0fa9c1f 100644
--- a/todo.lst
+++ b/todo.lst
@@ -57,7 +57,6 @@
events to empty pending list; this should be cleaned up
- try using userland helper to reload firmware upgrade into RAM on card reset
(see, e.g., hotplug subsystem and /sbin/hotplug)
-- add support for selecting open system/shared key auth when in station mode
- check wireless_copy.h and different ioctl numbering for different
wireless_ext versions
- command line arg vs. SIGHUP (now debug/daemonize will change on HUP)
@@ -105,9 +104,6 @@
supported rate set and basic rate set must be non-empty)
(this seems to cause STA-Prism2 cards not sending ACKs at least in some
cases)
-- test Shared Key Authentication with kernel driver; it did not seem to succeed
- (STA not found in auth_cb, or if STA was previously authenticated,
- "authentication failure")
- add new option to store RAM-downloaded STA f/w in the driver allocated
memory and download it automatically after COR sreset so that the new
version is not lost