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-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove FEATURE_WLAN_BTAMP_UT_RF

Browse source 
The driver contains FEATURE_WLAN_BTAMP_UT_RF code that is no longer
supported, so remove it.

Change-Id: Id9ff85b5a7c05e01fe6ceac0e9ce3e6aef6ff964
CRs-Fixed: 2365050
This commit is contained in:
Jeff Johnson 2018-12-09 21:06:33 -08:00 • committed by nshrivas
commit 3a87ce0ef9
2 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/sme/src/csr/csr_api_roam.c
View file

@ -6985,10 +6985,7 @@ static void csr_roam_process_join_res(struct mac_context *mac_ctx,
session->pWapiRspIE = NULL;
}
#endif /* FEATURE_WLAN_WAPI */
#ifdef FEATURE_WLAN_BTAMP_UT_RF
session->maxRetryCount = 0;
csr_roam_stop_join_retry_timer(mac_ctx, session_id);
#endif
/*
* Reset remain_in_power_active_till_dhcp as
* it might have been set by last failed secured connection.
@ -8113,9 +8110,7 @@ QDF_STATUS csr_roam_connect(struct mac_context *mac, uint32_t sessionId,
mac->roam.roamSession[sessionId].connectState)
mac->roam.roamSession[sessionId].connectState =
eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
#ifdef FEATURE_WLAN_BTAMP_UT_RF
pSession->maxRetryCount = CSR_JOIN_MAX_RETRY_COUNT;
#endif
pScanFilter = qdf_mem_malloc(sizeof(tCsrScanResultFilter));
if (NULL == pScanFilter) {
status = QDF_STATUS_E_NOMEM;
@ -8683,11 +8678,6 @@ QDF_STATUS csr_roam_disconnect_internal(struct mac_context *mac, uint32_t sessio
sme_err("session: %d not found", sessionId);
return QDF_STATUS_E_FAILURE;
}
#ifdef FEATURE_WLAN_BTAMP_UT_RF
/* Stop the retry */
pSession->maxRetryCount = 0;
csr_roam_stop_join_retry_timer(mac, sessionId);
#endif
/* Not to call cancel roaming here */
/* Only issue disconnect when necessary */
if (csr_is_conn_state_connected(mac, sessionId)
@ -16676,16 +16666,6 @@ QDF_STATUS csr_roam_open_session(struct mac_context *mac_ctx,
session->htConfig.ht_sgi20 = ht_cap_info->short_gi_20_mhz;
session->htConfig.ht_sgi40 = ht_cap_info->short_gi_40_mhz;
#ifdef FEATURE_WLAN_BTAMP_UT_RF
status = qdf_mc_timer_init(&session->hTimerJoinRetry, QDF_TIMER_TYPE_SW,
csr_roam_join_retry_timer_handler,
&session->joinRetryTimerInfo);
if (QDF_IS_STATUS_ERROR(status)) {
sme_err("cannot allocate memory for join retry timer");
return status;
}
#endif /* FEATURE_WLAN_BTAMP_UT_RF */
session->vht_config.max_mpdu_len = vht_cap_info->ampdu_len;
session->vht_config.supported_channel_widthset =
vht_cap_info->supp_chan_width;
@ -16822,9 +16802,6 @@ void csr_cleanup_session(struct mac_context *mac, uint32_t sessionId)
csr_roam_free_connected_info(mac, &pSession->connectedInfo);
qdf_mc_timer_destroy(&pSession->hTimerRoaming);
qdf_mc_timer_destroy(&pSession->roaming_offload_timer);
#ifdef FEATURE_WLAN_BTAMP_UT_RF
qdf_mc_timer_destroy(&pSession->hTimerJoinRetry);
#endif
csr_purge_vdev_pending_ser_cmd_list(mac, sessionId);
csr_init_session(mac, sessionId);
}

14
core/sme/src/csr/csr_inside_api.h
View file

@ -204,14 +204,11 @@ void csr_scan_callback(struct wlan_objmgr_vdev *vdev,
void csr_release_command_roam(struct mac_context *mac, tSmeCmd *pCommand);
void csr_release_command_wm_status_change(struct mac_context *mac,
tSmeCmd *pCommand);
void csr_release_roc_req_cmd(struct mac_context *mac_ctx,
tSmeCmd *pCommand);
QDF_STATUS csr_roam_save_connected_bss_desc(struct mac_context *mac,
uint32_t sessionId,
tSirBssDescription *pBssDesc);
bool csr_is_network_type_equal(tSirBssDescription *pSirBssDesc1,
tSirBssDescription *pSirBssDesc2);
/*
* Prepare a filter base on a profile for parsing the scan results.
* Upon successful return, caller MUST call csr_free_scan_filter on
@ -227,10 +224,6 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
struct csr_roam_profile *pSrcProfile);
QDF_STATUS csr_roam_start(struct mac_context *mac);
void csr_roam_stop(struct mac_context *mac, uint32_t sessionId);
void csr_roam_startMICFailureTimer(struct mac_context *mac);
void csr_roam_stopMICFailureTimer(struct mac_context *mac);
void csr_roam_startTKIPCounterMeasureTimer(struct mac_context *mac);
void csr_roam_stopTKIPCounterMeasureTimer(struct mac_context *mac);
QDF_STATUS csr_scan_open(struct mac_context *mac);
QDF_STATUS csr_scan_close(struct mac_context *mac);
@ -406,8 +399,7 @@ void csr_apply_channel_power_info_to_fw(struct mac_context *mac,
void csr_apply_power2_current(struct mac_context *mac);
void csr_assign_rssi_for_category(struct mac_context *mac, int8_t bestApRssi,
uint8_t catOffset);
QDF_STATUS csr_roam_start_roaming(struct mac_context *mac, uint32_t sessionId,
enum csr_roaming_reason roamingReason);
/* return a bool to indicate whether roaming completed or continue. */
bool csr_roam_complete_roaming(struct mac_context *mac, uint32_t sessionId,
bool fForce, eCsrRoamResult roamResult);
@ -1023,7 +1015,7 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
tSirBssDescription *bss_descr);
bool is_disconnect_pending(struct mac_context *mac_ctx,
uint8_t sessionid);
void csr_scan_active_list_timeout_handle(void *userData);
QDF_STATUS csr_prepare_disconnect_command(struct mac_context *mac,
uint32_t session_id, tSmeCmd **sme_cmd);