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

Merge "qcacld-3.0: Move LFR2 code under connection manager flag" into wlan-cld3.driver.lnx.2.0

Browse Source
This commit is contained in:
CNSS_WLAN Service
2021-02-22 22:28:35 -08:00
committed by Gerrit - the friendly Code Review server
parent d2fb85c4a1 dd6f134f2d
commit fe9ccbca6d
25 changed files with 343 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/umac/mlme/connection_mgr/core/src/wlan_cm_roam_offload.c
View File

@@ -2608,11 +2608,14 @@ cm_roam_stop_req(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
status = wlan_cm_tgt_send_roam_stop_req(psoc, vdev_id, stop_req);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_debug("fail to send roam stop");
} else {
}
#ifndef FEATURE_CM_ENABLE
else {
status = wlan_cm_roam_scan_offload_rsp(vdev_id, reason);
if (QDF_IS_STATUS_ERROR(status))
mlme_debug("fail to send rso rsp msg");
}
#endif
rel_vdev_ref:
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLME_CM_ID);
@@ -2966,9 +2969,12 @@ cm_roam_switch_to_rso_stop(struct wlan_objmgr_pdev *pdev,
* nothing to do here
*/
default:
#ifndef FEATURE_CM_ENABLE
/* For LFR2 BTM request, need handoff even roam disabled */
if (reason == REASON_OS_REQUESTED_ROAMING_NOW)
wlan_cm_roam_neighbor_proceed_with_handoff_req(vdev_id);
#endif
return QDF_STATUS_SUCCESS;
}
mlme_set_roam_state(psoc, vdev_id, WLAN_ROAM_RSO_STOPPED);
@@ -3377,7 +3383,12 @@ cm_roam_switch_to_roam_sync(struct wlan_objmgr_pdev *pdev,
* deauth roam trigger to stop data path queues
*/
case WLAN_ROAMING_IN_PROG:
if (!wlan_cm_is_sta_connected(vdev_id)) {
#ifdef FEATURE_CM_ENABLE
if (!cm_is_vdevid_connected(pdev, vdev_id))
#else
if (!wlan_cm_is_sta_connected(vdev_id))
#endif
{
mlme_err("ROAM: STA not in connected state");
return QDF_STATUS_E_FAILURE;
}

44
components/umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_roam_api.h
View File

@@ -104,28 +104,6 @@ wlan_roam_update_cfg(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
QDF_STATUS
wlan_cm_roam_cmd_allowed(struct wlan_objmgr_psoc *psoc, uint8_t vdev_id,
uint8_t rso_command, uint8_t reason);
#endif
/**
* wlan_cm_roam_scan_offload_rsp() - send roam scan offload response message
* @vdev_id: vdev id
* @reason: reason to roam
*
* This function gets called to send roam scan offload response message
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_roam_scan_offload_rsp(uint8_t vdev_id, uint8_t reason);
/**
* wlan_cm_send_beacon_miss() - initiate beacon miss
* @vdev_id: vdev id
* @rssi: AP rssi
*
* Return: void
*/
void wlan_cm_send_beacon_miss(uint8_t vdev_id, int32_t rssi);
/**
* wlan_cm_roam_neighbor_proceed_with_handoff_req() - invoke host handover to
@@ -139,6 +117,28 @@ void wlan_cm_send_beacon_miss(uint8_t vdev_id, int32_t rssi);
QDF_STATUS
wlan_cm_roam_neighbor_proceed_with_handoff_req(uint8_t vdev_id);
/**
* wlan_cm_roam_scan_offload_rsp() - send roam scan offload response message
* @vdev_id: vdev id
* @reason: reason to roam
*
* This function gets called to send roam scan offload response message
*
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_roam_scan_offload_rsp(uint8_t vdev_id, uint8_t reason);
#endif
/**
* wlan_cm_send_beacon_miss() - initiate beacon miss
* @vdev_id: vdev id
* @rssi: AP rssi
*
* Return: void
*/
void wlan_cm_send_beacon_miss(uint8_t vdev_id, int32_t rssi);
/**
* wlan_cm_is_sta_connected() - check if STA is connected
* @vdev_id: vdev id