Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: wpa_supplicant/sme.c

Issue 5840004: nl80211: Set cipher suites when using user space SME (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/hostap.git@0.9.130.B
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/drivers/driver_nl80211.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * wpa_supplicant - SME 2 * wpa_supplicant - SME
3 * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi> 3 * Copyright (c) 2009-2010, Jouni Malinen <j@w1.fi>
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify 5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as 6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Alternatively, this software may be distributed under the terms of BSD 9 * Alternatively, this software may be distributed under the terms of BSD
10 * license. 10 * license.
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 struct ieee802_11_elems elems; 325 struct ieee802_11_elems elems;
326 326
327 os_memset(&params, 0, sizeof(params)); 327 os_memset(&params, 0, sizeof(params));
328 params.bssid = bssid; 328 params.bssid = bssid;
329 params.ssid = wpa_s->sme.ssid; 329 params.ssid = wpa_s->sme.ssid;
330 params.ssid_len = wpa_s->sme.ssid_len; 330 params.ssid_len = wpa_s->sme.ssid_len;
331 params.freq = wpa_s->sme.freq; 331 params.freq = wpa_s->sme.freq;
332 params.wpa_ie = wpa_s->sme.assoc_req_ie_len ? 332 params.wpa_ie = wpa_s->sme.assoc_req_ie_len ?
333 wpa_s->sme.assoc_req_ie : NULL; 333 wpa_s->sme.assoc_req_ie : NULL;
334 params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len; 334 params.wpa_ie_len = wpa_s->sme.assoc_req_ie_len;
335 params.pairwise_suite = cipher_suite2driver(wpa_s->pairwise_cipher);
336 params.group_suite = cipher_suite2driver(wpa_s->group_cipher);
335 #ifdef CONFIG_IEEE80211R 337 #ifdef CONFIG_IEEE80211R
336 if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) { 338 if (auth_type == WLAN_AUTH_FT && wpa_s->sme.ft_ies) {
337 params.wpa_ie = wpa_s->sme.ft_ies; 339 params.wpa_ie = wpa_s->sme.ft_ies;
338 params.wpa_ie_len = wpa_s->sme.ft_ies_len; 340 params.wpa_ie_len = wpa_s->sme.ft_ies_len;
339 } 341 }
340 #endif /* CONFIG_IEEE80211R */ 342 #endif /* CONFIG_IEEE80211R */
341 params.mode = mode; 343 params.mode = mode;
342 params.mgmt_frame_protection = wpa_s->sme.mfp; 344 params.mgmt_frame_protection = wpa_s->sme.mfp;
343 if (wpa_s->sme.prev_bssid_set) 345 if (wpa_s->sme.prev_bssid_set)
344 params.prev_bssid = wpa_s->sme.prev_bssid; 346 params.prev_bssid = wpa_s->sme.prev_bssid;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 * the AP only disassociates us and leaves us in authenticated 482 * the AP only disassociates us and leaves us in authenticated
481 * state. For now, force the state to be cleared to avoid 483 * state. For now, force the state to be cleared to avoid
482 * confusing errors if we try to associate with the AP again. 484 * confusing errors if we try to associate with the AP again.
483 */ 485 */
484 wpa_printf(MSG_DEBUG, "SME: Deauthenticate to clear driver " 486 wpa_printf(MSG_DEBUG, "SME: Deauthenticate to clear driver "
485 "state"); 487 "state");
486 wpa_drv_deauthenticate(wpa_s, wpa_s->sme.prev_bssid, 488 wpa_drv_deauthenticate(wpa_s, wpa_s->sme.prev_bssid,
487 WLAN_REASON_DEAUTH_LEAVING); 489 WLAN_REASON_DEAUTH_LEAVING);
488 } 490 }
489 } 491 }
OLDNEW
« no previous file with comments | « src/drivers/driver_nl80211.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698