diff options
| author | Dan Williams | 2007-05-26 05:01:24 +0200 |
|---|---|---|
| committer | John W. Linville | 2007-06-11 20:28:44 +0200 |
| commit | 90a42210f275e1f828eb6c08bf8252c2d6a774e0 (patch) | |
| tree | 7530def8af573622c4d2a3223eb8774ee76a0405 /drivers/net/wireless/libertas/assoc.c | |
| parent | [PATCH] libertas: add more verbose debugging to libertas_cmd_80211_authenticate (diff) | |
| download | kernel-qcow2-linux-90a42210f275e1f828eb6c08bf8252c2d6a774e0.tar.gz kernel-qcow2-linux-90a42210f275e1f828eb6c08bf8252c2d6a774e0.tar.xz kernel-qcow2-linux-90a42210f275e1f828eb6c08bf8252c2d6a774e0.zip | |
[PATCH] libertas: Make WPA work through supplicant handshake
Fix WPA so it works up through the supplicant 4-Way handshake process.
Doesn't successfully pass traffic yet; may be problems installing
the GTK to the firmware.
- RSN needs to be enabled before the association command is sent
- Use keys from the association request not the adapter structure
- cmd_act_mac_strict_protection_enable != IW_AUTH_DROP_UNENCRYPTED
- Fix network filtering logic in is_network_compatible() WPA helpers
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
| -rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index 48fc6d171d58..2ee38a25adef 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c @@ -347,7 +347,17 @@ static int assoc_helper_secinfo(wlan_private *priv, sizeof(struct wlan_802_11_security)); ret = libertas_set_mac_packet_filter(priv); + if (ret) + goto out; + /* enable/disable RSN */ + ret = libertas_prepare_and_send_command(priv, + cmd_802_11_enable_rsn, + cmd_act_set, + cmd_option_waitforrsp, + 0, assoc_req); + +out: lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret); return ret; } @@ -360,22 +370,12 @@ static int assoc_helper_wpa_keys(wlan_private *priv, lbs_deb_enter(LBS_DEB_ASSOC); - /* enable/Disable RSN */ - ret = libertas_prepare_and_send_command(priv, - cmd_802_11_enable_rsn, - cmd_act_set, - cmd_option_waitforrsp, - 0, assoc_req); - if (ret) - goto out; - ret = libertas_prepare_and_send_command(priv, cmd_802_11_key_material, cmd_act_set, cmd_option_waitforrsp, 0, assoc_req); -out: lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret); return ret; } |