diff options
author | Dan Williams <dcbw@redhat.com> | 2007-05-25 23:01:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:44 -0400 |
commit | 90a42210f275e1f828eb6c08bf8252c2d6a774e0 (patch) | |
tree | 7530def8af573622c4d2a3223eb8774ee76a0405 /drivers/net/wireless/libertas/scan.c | |
parent | 45f43de829981e9b9de56d6098d00d511b4fb56c (diff) |
[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/scan.c')
-rw-r--r-- | drivers/net/wireless/libertas/scan.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index ec16cd08aead..3da1efdf1a0c 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c | |||
@@ -99,7 +99,6 @@ static inline int match_bss_wpa(struct wlan_802_11_security * secinfo, | |||
99 | { | 99 | { |
100 | if ( !secinfo->wep_enabled | 100 | if ( !secinfo->wep_enabled |
101 | && secinfo->WPAenabled | 101 | && secinfo->WPAenabled |
102 | && !secinfo->WPA2enabled | ||
103 | && (match_bss->wpa_ie[0] == WPA_IE) | 102 | && (match_bss->wpa_ie[0] == WPA_IE) |
104 | /* privacy bit may NOT be set in some APs like LinkSys WRT54G | 103 | /* privacy bit may NOT be set in some APs like LinkSys WRT54G |
105 | && bss->privacy */ | 104 | && bss->privacy */ |
@@ -113,7 +112,6 @@ static inline int match_bss_wpa2(struct wlan_802_11_security * secinfo, | |||
113 | struct bss_descriptor * match_bss) | 112 | struct bss_descriptor * match_bss) |
114 | { | 113 | { |
115 | if ( !secinfo->wep_enabled | 114 | if ( !secinfo->wep_enabled |
116 | && !secinfo->WPAenabled | ||
117 | && secinfo->WPA2enabled | 115 | && secinfo->WPA2enabled |
118 | && (match_bss->rsn_ie[0] == WPA2_IE) | 116 | && (match_bss->rsn_ie[0] == WPA2_IE) |
119 | /* privacy bit may NOT be set in some APs like LinkSys WRT54G | 117 | /* privacy bit may NOT be set in some APs like LinkSys WRT54G |