A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "qcacld-3.0: Rename hdd_station_ctx hdd_ReassocScenario field" into wlan-cld3.driver.lnx.2.0-dev

Browse source
This commit is contained in:
CNSS_WLAN Service 2017-10-26 07:28:01 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8e206623e7
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/hdd/inc/wlan_hdd_main.h
View file

@ -639,7 +639,7 @@ struct hdd_mon_set_ch_info {
* @ibss_enc_key: current ibss wep/wpa-none encryption key (if
* @ibss_enc_key_installed is %true)
* @ibss_peer_info: information about the ibss peer
* @hdd_ReassocScenario: is station in the middle of reassociation?
* @hdd_reassoc_scenario: is station in the middle of reassociation?
* @staDebugState: STA context debug variable
* @broadcast_staid: STA ID assigned for broadcast frames
* @ch_info: monitor mode channel information
@ -658,7 +658,7 @@ struct hdd_station_ctx {
bool ibss_enc_key_installed;
tCsrRoamSetKey ibss_enc_key;
tSirPeerInfoRspParams ibss_peer_info;
bool hdd_ReassocScenario;
bool hdd_reassoc_scenario;
int staDebugState;
uint8_t broadcast_staid;
struct hdd_mon_set_ch_info ch_info;

22
core/hdd/src/wlan_hdd_assoc.c
View file

@ -2327,7 +2327,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
WLAN_HDD_GET_STATION_CTX_PTR(adapter);
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
timeout = hddstactx->hdd_ReassocScenario ?
timeout = hddstactx->hdd_reassoc_scenario ?
AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE :
hdd_ctx->config->auto_bmps_timer_val * 1000;
@ -4433,9 +4433,9 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
hdd_dis_connect_handler(adapter, roam_info, roamId,
roamStatus, roamResult);
sta_ctx->ft_carrier_on = false;
sta_ctx->hdd_ReassocScenario = false;
hdd_debug("hdd_ReassocScenario set to: %d, ReAssoc Failed, session: %d",
sta_ctx->hdd_ReassocScenario, adapter->sessionId);
sta_ctx->hdd_reassoc_scenario = false;
hdd_debug("hdd_reassoc_scenario set to: %d, ReAssoc Failed, session: %d",
sta_ctx->hdd_reassoc_scenario, adapter->sessionId);
break;
case eCSR_ROAM_FT_START:
@ -4459,9 +4459,9 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
if (!QDF_IS_STATUS_SUCCESS(status))
qdf_ret_status = QDF_STATUS_E_FAILURE;
sta_ctx->ft_carrier_on = true;
sta_ctx->hdd_ReassocScenario = true;
hdd_debug("hdd_ReassocScenario set to: %d, due to eCSR_ROAM_FT_START, session: %d",
sta_ctx->hdd_ReassocScenario, adapter->sessionId);
sta_ctx->hdd_reassoc_scenario = true;
hdd_debug("hdd_reassoc_scenario set to: %d, due to eCSR_ROAM_FT_START, session: %d",
sta_ctx->hdd_reassoc_scenario, adapter->sessionId);
break;
case eCSR_ROAM_NAPI_OFF:
hdd_debug("After Roam Synch Comp: NAPI Serialize OFF");
@ -4573,10 +4573,10 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *roam_info, uint32_t roamId,
roamId, roamStatus,
roamResult);
if (eCSR_ROAM_RESULT_AUTHENTICATED == roamResult) {
sta_ctx->hdd_ReassocScenario = false;
hdd_debug("hdd_ReassocScenario set to: %d, set key complete, session: %d",
sta_ctx->hdd_ReassocScenario,
adapter->sessionId);
sta_ctx->hdd_reassoc_scenario = false;
hdd_debug("hdd_reassoc_scenario set to: %d, set key complete, session: %d",
sta_ctx->hdd_reassoc_scenario,
adapter->sessionId);
}
}
#ifdef WLAN_FEATURE_ROAM_OFFLOAD

4
core/hdd/src/wlan_hdd_main.c
View file

@ -4608,7 +4608,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
WLAN_CONTROL_PATH);
}
adapter->sessionCtx.station.hdd_ReassocScenario = false;
adapter->sessionCtx.station.hdd_reassoc_scenario = false;
hdd_deinit_tx_rx(adapter);
policy_mgr_decr_session_set_pcl(hdd_ctx->hdd_psoc,
@ -5230,7 +5230,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
wireless_send_event(adapter->dev, SIOCGIWAP,
&wrqu, NULL);
adapter->sessionCtx.station.
hdd_ReassocScenario = false;
hdd_reassoc_scenario = false;
/* indicate disconnected event to nl80211 */
wlan_hdd_cfg80211_indicate_disconnect(

8
core/hdd/src/wlan_hdd_stats.c
View file

@ -1351,7 +1351,7 @@ int wlan_hdd_ll_stats_get(struct hdd_adapter *adapter, uint32_t req_id,
if (0 != ret)
return -EINVAL;
if (hddstactx->hdd_ReassocScenario) {
if (hddstactx->hdd_reassoc_scenario) {
hdd_err("Roaming in progress, cannot process the request");
return -EBUSY;
}
@ -1416,7 +1416,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
return -EINVAL;
}
if (hddstactx->hdd_ReassocScenario) {
if (hddstactx->hdd_reassoc_scenario) {
hdd_err("Roaming in progress, cannot process the request");
return -EBUSY;
}
@ -3946,7 +3946,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
return 0;
}
if (true == sta_ctx->hdd_ReassocScenario) {
if (sta_ctx->hdd_reassoc_scenario) {
hdd_debug("Roaming is in progress, cannot continue with this request");
/*
* supplicant reports very low rssi to upper layer
@ -4631,7 +4631,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy,
if (hdd_ctx->config->fEnableSNRMonitoring == 0)
return -ENONET;
if (sta_ctx->hdd_ReassocScenario) {
if (sta_ctx->hdd_reassoc_scenario) {
hdd_info("Roaming in progress, hence return");
return -ENONET;
}

2
core/hdd/src/wlan_hdd_wext.c
View file

@ -3574,7 +3574,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
return QDF_STATUS_SUCCESS;
}
if (sta_ctx->hdd_ReassocScenario) {
if (sta_ctx->hdd_reassoc_scenario) {
hdd_debug("Roaming in progress, return cached RSSI");
*rssi_value = adapter->rssi;
return QDF_STATUS_SUCCESS;