samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Change conn_state to connecting before sme_roam_connect

Browse Source 
qcacld-2.0 to qcacld-3.0 propagation

sme_roam_connect() has a direct path to call hdd_sme_roam_callback(),
which will change the conn_state.
If direct path, conn_state will be accordingly changed to
NotConnected or Associated.
Driver is not changing connection state to eConnectionState_Connecting
when connecting with iwconfig.
If connection state is not changed, connection state will remain
in eConnectionState_NotConnected state.
In hdd_association_completion_handler, "hddDisconInProgress" is set
to true if conn state is eConnectionState_NotConnected.
If "hddDisconInProgress" is set to true then cfg80211 layer is not
informed of connect result indication which is an issue.

Change-Id: Ieeaef582a04aa90ddcdcc373b00b68442c795337
CRs-Fixed: 900008
This commit is contained in:
Agrawal Ashish
2016-05-05 11:22:18 +05:30
committed by Akash Patel
parent 0f94b570ed
commit 6b01576aa8
2 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/hdd/src/wlan_hdd_assoc.c
View File

@@ -5001,8 +5001,41 @@ static int __iw_set_essid(struct net_device *dev,
(WLAN_HDD_GET_CTX(pAdapter))->config-> (WLAN_HDD_GET_CTX(pAdapter))->config->
AdHocChannel5G); AdHocChannel5G);
} }
/*
* Change conn_state to connecting before sme_roam_connect(),
* because sme_roam_connect() has a direct path to call
* hdd_sme_roam_callback(), which will change the conn_state
* If direct path, conn_state will be accordingly changed to
* NotConnected or Associated by either
* hdd_association_completion_handler() or hdd_dis_connect_handler()
* in sme_RoamCallback()if sme_RomConnect is to be queued,
* Connecting state will remain until it is completed.
*
* If connection state is not changed,
* connection state will remain in eConnectionState_NotConnected state.
* In hdd_association_completion_handler, "hddDisconInProgress" is
* set to true if conn state is eConnectionState_NotConnected.
* If "hddDisconInProgress" is set to true then cfg80211 layer is not
* informed of connect result indication which is an issue.
*/
if (QDF_STA_MODE == pAdapter->device_mode ||
QDF_P2P_CLIENT_MODE == pAdapter->device_mode) {
hdd_info("Set HDD connState to eConnectionState_Connecting");
hdd_conn_set_connection_state(pAdapter,
eConnectionState_Connecting);
}
status = sme_roam_connect(hHal, pAdapter->sessionId, status = sme_roam_connect(hHal, pAdapter->sessionId,
&(pWextState->roamProfile), &roamId); &(pWextState->roamProfile), &roamId);
if ((QDF_STATUS_SUCCESS != status) &&
(QDF_STA_MODE == pAdapter->device_mode ||
QDF_P2P_CLIENT_MODE == pAdapter->device_mode)) {
hdd_err("sme_roam_connect (session %d) failed with status %d. -> NotConnected",
pAdapter->sessionId, status);
/* change back to NotAssociated */
hdd_conn_set_connection_state(pAdapter,
eConnectionState_NotConnected);
}
pRoamProfile->ChannelInfo.ChannelList = NULL; pRoamProfile->ChannelInfo.ChannelList = NULL;
pRoamProfile->ChannelInfo.numOfChannels = 0; pRoamProfile->ChannelInfo.numOfChannels = 0;

40
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -8583,20 +8583,6 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
return -EINVAL; return -EINVAL;
} }
/* change conn_state to connecting before sme_roam_connect(), because sme_roam_connect()
* has a direct path to call hdd_sme_roam_callback(), which will change the conn_state
* If direct path, conn_state will be accordingly changed to NotConnected or Associated
* by either hdd_association_completion_handler() or hdd_dis_connect_handler() in sme_RoamCallback()
* if sme_RomConnect is to be queued, Connecting state will remain until it is completed.
*/
if (QDF_STA_MODE == pAdapter->device_mode ||
QDF_P2P_CLIENT_MODE == pAdapter->device_mode) {
hddLog(LOG1,
FL("Set HDD connState to eConnectionState_Connecting"));
hdd_conn_set_connection_state(pAdapter,
eConnectionState_Connecting);
}
/* After 8-way handshake supplicant should give the scan command /* After 8-way handshake supplicant should give the scan command
* in that it update the additional IEs, But because of scan * in that it update the additional IEs, But because of scan
* enhancements, the supplicant is not issuing the scan command now. * enhancements, the supplicant is not issuing the scan command now.
@@ -8652,6 +8638,32 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter,
pHddCtx->config->nChannelBondingMode24GHz; pHddCtx->config->nChannelBondingMode24GHz;
sme_update_config(pHddCtx->hHal, sme_config); sme_update_config(pHddCtx->hHal, sme_config);
qdf_mem_free(sme_config); qdf_mem_free(sme_config);
/*
* Change conn_state to connecting before sme_roam_connect(),
* because sme_roam_connect() has a direct path to call
* hdd_sme_roam_callback(), which will change the conn_state
* If direct path, conn_state will be accordingly changed to
* NotConnected or Associated by either
* hdd_association_completion_handler() or
* hdd_dis_connect_handler() in sme_RoamCallback()if
* sme_RomConnect is to be queued,
* Connecting state will remain until it is completed.
*
* If connection state is not changed, connection state will
* remain in eConnectionState_NotConnected state.
* In hdd_association_completion_handler, "hddDisconInProgress"
* is set to true if conn state is
* eConnectionState_NotConnected.
* If "hddDisconInProgress" is set to true then cfg80211 layer
* is not informed of connect result indication which
* is an issue.
*/
if (QDF_STA_MODE == pAdapter->device_mode ||
QDF_P2P_CLIENT_MODE == pAdapter->device_mode) {
hdd_info("Set HDD connState to eConnectionState_Connecting");
hdd_conn_set_connection_state(pAdapter,
eConnectionState_Connecting);
}
status = sme_roam_connect(WLAN_HDD_GET_HAL_CTX(pAdapter), status = sme_roam_connect(WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, pRoamProfile, pAdapter->sessionId, pRoamProfile,