aboutsummaryrefslogtreecommitdiffstats
path: root/src/eapol_supp/eapol_supp_sm.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-10-22 13:52:46 -0700
committerDmitry Shmidt <dimitrysh@google.com>2013-10-22 13:52:46 -0700
commit051af73b8f8014eff33330aead0f36944b3403e6 (patch)
tree8e1d198bba44a3f1037eb4e58c81d75a66f0711e /src/eapol_supp/eapol_supp_sm.c
parent3b7e16d414e38c8856c4712f3a0768c89689cbc3 (diff)
downloadandroid_external_wpa_supplicant_8-051af73b8f8014eff33330aead0f36944b3403e6.tar.gz
android_external_wpa_supplicant_8-051af73b8f8014eff33330aead0f36944b3403e6.tar.bz2
android_external_wpa_supplicant_8-051af73b8f8014eff33330aead0f36944b3403e6.zip
Cumulative patch from commit 538922a628d4f5403b9a96b171a59235bcb3d921
538922a dbus: Add boolean AllowRoam option to Scan() method options dictionary c6f5dec Don't start second scan when changing scan interval cd3b070 nl80211: Fix DFS radar event parsing 2b72df6 nl80211: Free BSS structure even if netdev does not exists 41cc50d nl80211: Update send_action_cookie on AP-offchannel-TX path 313424d GAS: Add support for multiple pending queries for the same destination cbc5484 GAS: Do not start new scan operation during an ongoing GAS query c377514 GAS: Delay GAS query Tx while scanning/connecting 24c694b GAS: Delay GAS query Tx while another query is in progress 7255983 WPS: Clear after_wps from number of new locations 73b54d6 P2P: Fix Operating Channel in Invitation Request for operating group dc46fd6 P2P: Cancel offchannel TX wait on Invitation Response RX 0c92963 D-Bus: Clean up debug print for P2P invitation result 8d82c21 P2P: Fix PD retry channel on join-a-group case d285888 P2P: Add GO BSS entry details to debug log on join-a-group 512629a P2P: Accept Invitation Response non-success without Channel List e241b1b eap_proxy: Fix IMSI fetch for home vs. visited network determination db13605 EAP-AKA/AKA' peer: Allow external USIM processing to be used 569ccf7 EAP-SIM peer: Allow external SIM processing to be used 84dc137 hlr_auc_gw: Add GSM-AUTH-REQ command a5d44ac EAP peer: Add framework for external SIM/USIM processing 7e8bc7d eapol_test: Initialize BSS lists bceb843 Send CTRL-RSP command response before processing EAPOL update b607796 eapol_test: Fix external EAP request mechanism 94de082 eapol_test: Initialize wpa_s->global to fix ctrl_iface f07bba3 Android: Add dfs.c into build 0cf0af2 WNM: Set Disassoc Imminent flag in ESS Disassoc Imminent frame f47c145 Interworking: Add required_roaming_consortium parameter for credentials a83e574 GAS: Update timeout from TX status handler e88060e HTTP server: Allow TCP socket to be reused 9bc3386 Add test option for specifying hardcoded BSS Load element 9c7e43a Define BSS Load element id 56f5af4 Interworking: Add support for QoS Mapping functionality for the STA 850e1c2 atheros: Add support for QoS Mapping configuration c551700 Interworking: Add support for QoS Mapping functionality for the AP ac1bc54 Interworking: Add domain_suffix_match for credentials 463c8ff Interworking: Add support for multiple home FQDNs 01f809c Add AAA server domain name suffix matching constraint be7963b OpenSSL: Fix code indentation in OCSP processing 899cc14 hostapd: Add support for DFS with 160 MHz channel width 6de0e0c Mark DFS functions static and rename them 58b73e3 hostapd: DFS with 40/80 MHz channel width support 846de15 DFS: Add more parameters to radar events 04e8003 nl80211: Use struct hostapd_freq_params with start_dfs_cac 72c753d hostapd: Split hostapd_set_freq to helper function e76da50 hostapd: Add AP DFS support Change-Id: Ie9ed4662ba6d81e6d8b14bccb29ffa192becf0f2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eapol_supp/eapol_supp_sm.c')
-rw-r--r--src/eapol_supp/eapol_supp_sm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c
index c4475e57..03ec2cb4 100644
--- a/src/eapol_supp/eapol_supp_sm.c
+++ b/src/eapol_supp/eapol_supp_sm.c
@@ -1479,6 +1479,7 @@ void eapol_sm_notify_config(struct eapol_sm *sm,
eap_set_fast_reauth(sm->eap, conf->fast_reauth);
eap_set_workaround(sm->eap, conf->workaround);
eap_set_force_disabled(sm->eap, conf->eap_disabled);
+ eap_set_external_sim(sm->eap, conf->external_sim);
}
}