diff options
| author | Bala Krishna Bhamidipati <bbhami@codeaurora.org> | 2015-12-16 12:45:49 +0530 |
|---|---|---|
| committer | Amarnath Hullur Subramanyam <amarnath@codeaurora.org> | 2016-03-23 19:26:14 -0700 |
| commit | 6ddb4753ddada89607db9f4c9fdd9629744d07e0 (patch) | |
| tree | 3cdd78a55cdfcbe5399dc997e8ad4172a4ea752e | |
| parent | 803e72d1898b6de0e7c5bbb513ad365a1102006e (diff) | |
| download | android_external_wpa_supplicant_8-6ddb4753ddada89607db9f4c9fdd9629744d07e0.tar.gz android_external_wpa_supplicant_8-6ddb4753ddada89607db9f4c9fdd9629744d07e0.tar.bz2 android_external_wpa_supplicant_8-6ddb4753ddada89607db9f4c9fdd9629744d07e0.zip | |
eap_proxy: include qmi-framework for QCCI migration
qmi-framework will generate qmi_cci library needed by eap_proxy
for QCCI interface APIs. add qmi-framework to PKG_CONFIG to link
this library.
This change will also add flags to support DSDS and eap-AKA'
feature on mdm.
Change-Id: Ibbf38f85f315fc0a33b190e3992cacd4843a1eea
CRs-Fixed: 952339
| -rw-r--r-- | src/eap_peer/eap_proxy_qmi.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/eap_proxy_qmi.mak | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/eap_peer/eap_proxy_qmi.c b/src/eap_peer/eap_proxy_qmi.c index bf3bb6af..f8c9cbda 100644 --- a/src/eap_peer/eap_proxy_qmi.c +++ b/src/eap_peer/eap_proxy_qmi.c @@ -1795,6 +1795,10 @@ static Boolean eap_proxy_build_identity(struct eap_proxy_sm *eap_proxy, u8 id, s wpa_printf(MSG_ERROR, " QMI-ERROR Unable to start the EAP session;" " error_ret=%d; qmi_err=%d\n", qmiRetCode, eap_auth_start_resp.resp.error); + if(eap_auth_start.eap_method_mask == QMI_AUTH_EAP_METHOD_MASK_AKA_PRIME_V01 && + eap_auth_start_resp.resp.error == QMI_ERR_INVALID_ARG_V01) + wpa_printf(MSG_ERROR, "QMI-ERROR AKA' not supported\n"); + return FALSE; } eap_proxy->eap_auth_session_flag[sim_num] = TRUE; diff --git a/wpa_supplicant/eap_proxy_qmi.mak b/wpa_supplicant/eap_proxy_qmi.mak index 0ed7957b..0a046f62 100644 --- a/wpa_supplicant/eap_proxy_qmi.mak +++ b/wpa_supplicant/eap_proxy_qmi.mak @@ -1,12 +1,19 @@ CFLAGS += -DSIM_AKA_IDENTITY_IMSI CFLAGS += -DSIM_AKA_IMSI_RAW_ENABLED -CFLAGS += $(shell $(PKG_CONFIG) --cflags qmi) +CFLAGS += $(shell $(PKG_CONFIG) --cflags qmi qmi-framework) -LIBS += $(shell $(PKG_CONFIG) --libs qmi) +LIBS += $(shell $(PKG_CONFIG) --libs qmi qmi-framework) -lpthread # EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). # This requires CONFIG_EAP_AKA to be enabled, too. # This is supported only in B Family devices. CONFIG_EAP_AKA_PRIME=y +ifdef CONFIG_EAP_PROXY_AKA_PRIME +CFLAGS += -DCONFIG_EAP_PROXY_AKA_PRIME +endif + +ifdef CONFIG_EAP_PROXY_DUAL_SIM +CFLAGS += -DCONFIG_EAP_PROXY_DUAL_SIM +endif |