libertas: fix WPA adhoc network creation
PATCH 5/5 libertas: fix WPA adhoc network creation
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
drivers/net/wireless/libertas/assoc.c +5 -3
@@ -711,11 +711,13 @@ static int lbs_adhoc_start(struct lbs_private *priv,/* set capability info */ tmpcap =WLAN_CAPABILITY_IBSS ; -if (assoc_req->secinfo.wep_enabled) { -lbs_deb_join ("ADHOC_START: WEP enabled, setting privacy on\n" ); +if (assoc_req->secinfo.wep_enabled || + assoc_req->secinfo.WPAenabled || + assoc_req->secinfo.WPA2enabled) { +lbs_deb_join ("ADHOC_START: WEP/WPA enabled, privacy on\n" ); tmpcap |=WLAN_CAPABILITY_PRIVACY ; }else -lbs_deb_join ("ADHOC_START: WEP disabled, setting privacy off\n" ); +lbs_deb_join ("ADHOC_START: WEP disabled, privacy off\n" ); cmd.capability =cpu_to_le16 (tmpcap);
Quoted 3 lines · Dan Williams
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
Turns out v10 firmware now has this capability, but v9 and lower do not. Just for the record.
Dan
Quoted 28 lines
Signed-off-by Dan Williams <[email protected]>drivers/net/wireless/libertas/assoc.c +5
-4@@ -711,11 +711,13 @@ static int lbs_adhoc_start(struct lbs_private *priv,/* set capability info */ tmpcap =WLAN_CAPABILITY_IBSS ; -if (assoc_req->secinfo.wep_enabled) { -lbs_deb_join ("ADHOC_START: WEP enabled, setting privacy on\n" ); +if (assoc_req->secinfo.wep_enabled || + assoc_req->secinfo.WPAenabled || + assoc_req->secinfo.WPA2enabled) { +lbs_deb_join ("ADHOC_START: WEP/WPA enabled, privacy on\n" ); tmpcap |=WLAN_CAPABILITY_PRIVACY ; }else -lbs_deb_join ("ADHOC_START: WEP disabled, setting privacy off\n" ); +lbs_deb_join ("ADHOC_START: WEP disabled, privacy off\n" ); cmd.capability =cpu_to_le16 (tmpcap); --To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Johannes Berg
maintainerQuoted 3 lines · Dan Williams
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
We don't even properly support WPA IBSS in mac80211...
johannes
Quoted 6 lines · Johannes Berg
Quoted 3 lines · Dan Williams
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
We don't even properly support WPA IBSS in mac80211...
Hmm, I support creating WPA-PSK adhoc networks in the NM UI (worked last summer when I added the code), can you give a 10 second summary of what's missing here?
Dan
Johannes Berg
maintainerQuoted 11 lines · Dan Williams
Quoted 6 lines · Johannes Berg
Quoted 3 lines · Dan Williams
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
We don't even properly support WPA IBSS in mac80211...
Hmm, I support creating WPA-PSK adhoc networks in the NM UI (worked last summer when I added the code), can you give a 10 second summary of what's missing here?
Hm, well, Jouni says it doesn't play well with XP or Vista and we don't have per-station group keys we'd need in theory.
johannes
Quoted 7 lines · Johannes Berg
Quoted 6 lines · Dan Williams
Quoted 5 lines · Johannes Berg
Quoted 3 lines · Dan Williams
Oddly enough, the firmware's JOIN/START commands don't appear to have any facility for setting custom IEs, thus the started adhoc network doesn't advertise its WPA capability in the beacon. Whee!
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
We don't even properly support WPA IBSS in mac80211...
Hmm, I support creating WPA-PSK adhoc networks in the NM UI (worked last summer when I added the code), can you give a 10 second summary of what's missing here?
Hm, well, Jouni says it doesn't play well with XP or Vista and we don't have per-station group keys we'd need in theory.
Please note that "WPA IBSS" and "RSN IBSS" are two quite different beasts. WPA (as in the old v1 before IEEE 802.11i was finished) introduced a WPA-None mode in which there is actually no key management and the TKIP (or CCMP) key is pre-configured on the stations. This interoperates to more or less the extent possible (the mode itself is not really very nice design taken into account the replay protection and no mechanism to deliver current packet number). I do not know how strictly various implementations require the WPA IE to be in the Beacon frames for WPA IBSS/WPA-None to work.
RSN IBSS (the mechanism introduced in the IEEE 802.11i-2004 and in theory, included in WPA2, but not really interop tested that much) includes full authentication and key management step similarly to the managed AP--station case. This is likely to require the Beacon and Probe Response frames to include the correct RSN IE.
I haven't tested RSN IBSS with XP (and don't even know a driver that would support it there), but as far as brief tests with Vista are concerned, there seemed to be some interop issues in the 4-way handshake. Anyway, we do not yet have the needed support for this in mac80211 (per-STA GTK/group key).
Signature · 1 line
Jouni Malinen PGP id EFC895FA