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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Rename connection manager candidate select APIs

Browse source 
Rename connection manager candidate select APIs to bss select.

Change-Id: Icabeb57965920ec82e690bee662528189b081f32
CRs-Fixed: 2786493
This commit is contained in:
gaurank kathpalia 2020-09-29 07:52:40 +05:30 • committed by snandini
commit 54f1e8f100
7 changed files with 30 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

24
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c
View file

@ -706,8 +706,7 @@ static void cm_create_bss_peer(struct cnx_mgr *cm_ctx,
}
static QDF_STATUS
cm_send_candidate_select_indication(struct cnx_mgr *cm_ctx,
struct cm_connect_req *req)
cm_send_bss_select_ind(struct cnx_mgr *cm_ctx, struct cm_connect_req *req)
{
QDF_STATUS status;
struct wlan_cm_vdev_connect_req vdev_req;
@ -717,7 +716,7 @@ cm_send_candidate_select_indication(struct cnx_mgr *cm_ctx,
vdev_req.cm_id = req->cm_id;
vdev_req.bss = req->cur_candidate;
status = mlme_cm_candidate_select_ind(cm_ctx->vdev, &vdev_req);
status = mlme_cm_bss_select_ind(cm_ctx->vdev, &vdev_req);
if (QDF_IS_STATUS_SUCCESS(status) ||
status == QDF_STATUS_E_NOSUPPORT)
return status;
@ -729,7 +728,7 @@ cm_send_candidate_select_indication(struct cnx_mgr *cm_ctx,
return QDF_STATUS_E_FAILURE;
cm_fill_failure_resp_from_cm_id(cm_ctx, resp, req->cm_id,
CM_CANDIDATE_SELECT_IND_FAILED);
CM_BSS_SELECT_IND_FAILED);
cm_sm_deliver_event_sync(cm_ctx,
WLAN_CM_SM_EV_CONNECT_GET_NEXT_CANDIDATE,
sizeof(*resp), resp);
@ -756,8 +755,7 @@ QDF_STATUS cm_try_next_candidate(struct cnx_mgr *cm_ctx,
mlme_cm_osif_failed_candidate_ind(cm_ctx->vdev, resp);
status = cm_send_candidate_select_indication(cm_ctx,
&cm_req->connect_req);
status = cm_send_bss_select_ind(cm_ctx, &cm_req->connect_req);
/*
* If candidate select indication is not supported continue with bss
* peer create, else peer will be created after resp.
@ -801,8 +799,7 @@ QDF_STATUS cm_connect_active(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
if (QDF_IS_STATUS_ERROR(status))
goto connect_err;
status = cm_send_candidate_select_indication(cm_ctx,
&cm_req->connect_req);
status = cm_send_bss_select_ind(cm_ctx, &cm_req->connect_req);
/*
* If candidate select indication is not supported continue with bss
* peer create, else peer will be created after resp.
@ -820,8 +817,7 @@ connect_err:
}
QDF_STATUS
cm_peer_create_on_candidate_select_ind_resp(struct cnx_mgr *cm_ctx,
wlan_cm_id *cm_id)
cm_peer_create_on_bss_select_ind_resp(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
{
struct cm_req *cm_req;
@ -1018,8 +1014,8 @@ post_err:
return qdf_status;
}
QDF_STATUS cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status)
QDF_STATUS cm_bss_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status)
{
struct cnx_mgr *cm_ctx;
QDF_STATUS qdf_status;
@ -1044,7 +1040,7 @@ QDF_STATUS cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
if (QDF_IS_STATUS_SUCCESS(status)) {
qdf_status =
cm_sm_deliver_event(vdev,
WLAN_CM_SM_EV_CANDIDATE_SELECT_IND_SUCCESS,
WLAN_CM_SM_EV_BSS_SELECT_IND_SUCCESS,
sizeof(wlan_cm_id), &cm_id);
if (QDF_IS_STATUS_SUCCESS(qdf_status))
return qdf_status;
@ -1060,7 +1056,7 @@ QDF_STATUS cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
}
cm_fill_failure_resp_from_cm_id(cm_ctx, resp, cm_id,
CM_CANDIDATE_SELECT_IND_FAILED);
CM_BSS_SELECT_IND_FAILED);
qdf_status =
cm_sm_deliver_event(vdev,
WLAN_CM_SM_EV_CONNECT_GET_NEXT_CANDIDATE,

14
umac/mlme/connection_mgr/core/src/wlan_cm_main_api.h
View file

@ -104,16 +104,16 @@ QDF_STATUS cm_try_next_candidate(struct cnx_mgr *cm_ctx,
struct wlan_cm_connect_rsp *connect_resp);
/**
* cm_peer_create_on_candidate_select_ind_resp() - Called to create peer
* if peer select inidication's resp was success
* cm_peer_create_on_bss_select_ind_resp() - Called to create peer
* if bss select inidication's resp was success
* @cm_ctx: connection manager context
* @cm_id: Connection mgr ID assigned to this connect request.
*
* Return: QDF status
*/
QDF_STATUS
cm_peer_create_on_candidate_select_ind_resp(struct cnx_mgr *cm_ctx,
wlan_cm_id *cm_id);
cm_peer_create_on_bss_select_ind_resp(struct cnx_mgr *cm_ctx,
wlan_cm_id *cm_id);
/**
* cm_resume_connect_after_peer_create() - Called after bss create rsp
@ -126,15 +126,15 @@ QDF_STATUS
cm_resume_connect_after_peer_create(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id);
/**
* cm_candidate_select_ind_rsp() - Connection manager resp for candidate
* cm_bss_select_ind_rsp() - Connection manager resp for bss
* select indication
* @vdev: vdev pointer
* @status: Status
*
* Return: QDF_STATUS
*/
QDF_STATUS cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status);
QDF_STATUS cm_bss_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status);
/**
* cm_bss_peer_create_rsp() - handle bss peer create response

6
umac/mlme/connection_mgr/core/src/wlan_cm_sm.c
View file

@ -571,13 +571,13 @@ static bool cm_subst_join_active_event(void *ctx, uint16_t event,
cm_sm_deliver_event_sync(cm_ctx, event, data_len, data);
status = true;
break;
case WLAN_CM_SM_EV_CANDIDATE_SELECT_IND_SUCCESS:
case WLAN_CM_SM_EV_BSS_SELECT_IND_SUCCESS:
/* check if cm id is valid for the current req */
if (!cm_check_cmid_match_list_head(cm_ctx, data)) {
status = false;
break;
}
cm_peer_create_on_candidate_select_ind_resp(cm_ctx, data);
cm_peer_create_on_bss_select_ind_resp(cm_ctx, data);
status = true;
break;
case WLAN_CM_SM_EV_BSS_CREATE_PEER_SUCCESS:
@ -760,7 +760,7 @@ static const char *cm_sm_event_names[] = {
"EV_CONNECT_START",
"EV_CONNECT_ACTIVE",
"EV_CONNECT_SUCCESS",
"EV_MLME_CANDIDATE_SELECT_IND_SUCCESS",
"EV_BSS_SELECT_IND_SUCCESS",
"EV_BSS_CREATE_PEER_SUCCESS"
"EV_CONNECT_GET_NXT_CANDIDATE",
"EV_CONNECT_FAILURE",

5
umac/mlme/connection_mgr/core/src/wlan_cm_sm.h
View file

@ -37,8 +37,7 @@
* @WLAN_CM_SM_EV_CONNECT_START: Connect start process initiate
* @WLAN_CM_SM_EV_CONNECT_ACTIVE: Connect request is activated
* @WLAN_CM_SM_EV_CONNECT_SUCCESS: Connect success
* @WLAN_CM_SM_EV_CANDIDATE_SELECT_IND_SUCCESS: Mlme resp for mlme active cmd
* req
* @WLAN_CM_SM_EV_BSS_SELECT_IND_SUCCESS: Mlme resp for BSS select indication
* @WLAN_CM_SM_EV_BSS_CREATE_PEER_SUCCESS: BSS peer create success
* @WLAN_CM_SM_EV_CONNECT_GET_NEXT_CANDIDATE: Get next candidate for connection
* @WLAN_CM_SM_EV_CONNECT_FAILURE: Connect failed for all candidate
@ -70,7 +69,7 @@ enum wlan_cm_sm_evt {
WLAN_CM_SM_EV_CONNECT_START = 6,
WLAN_CM_SM_EV_CONNECT_ACTIVE = 7,
WLAN_CM_SM_EV_CONNECT_SUCCESS = 8,
WLAN_CM_SM_EV_CANDIDATE_SELECT_IND_SUCCESS = 9,
WLAN_CM_SM_EV_BSS_SELECT_IND_SUCCESS = 9,
WLAN_CM_SM_EV_BSS_CREATE_PEER_SUCCESS = 10,
WLAN_CM_SM_EV_CONNECT_GET_NEXT_CANDIDATE = 11,
WLAN_CM_SM_EV_CONNECT_FAILURE = 12,

6
umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_api.h
View file

@ -47,15 +47,15 @@ QDF_STATUS wlan_cm_start_disconnect(struct wlan_objmgr_vdev *vdev,
struct wlan_cm_disconnect_req *req);
/**
* wlan_cm_candidate_select_ind_rsp() - Connection manager resp for candidate
* wlan_cm_bss_select_ind_rsp() - Connection manager resp for bss
* select indication
* @vdev: vdev pointer
* @status: Status
*
* Return: QDF_STATUS
*/
QDF_STATUS wlan_cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status);
QDF_STATUS wlan_cm_bss_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status);
/**
* wlan_cm_bss_peer_create_rsp() - Connection manager bss peer create response

4
umac/mlme/connection_mgr/dispatcher/inc/wlan_cm_public_struct.h
View file

@ -207,7 +207,7 @@ struct wlan_cm_vdev_discon_req {
* enum wlan_cm_connect_fail_reason: connection manager connect fail reason
* @CM_NO_CANDIDATE_FOUND: No candidate found
* @CM_ABORT_DUE_TO_NEW_REQ_RECVD: Aborted as new command is received and
* @CM_CANDIDATE_SELECT_IND_FAILED: Failed candidate select indication
* @CM_BSS_SELECT_IND_FAILED: Failed BSS select indication
* State machine is not able to handle as state has changed due to new command.
* @CM_PEER_CREATE_FAILED: peer create failed
* @CM_JOIN_FAILED: Failed in joining state
@ -226,7 +226,7 @@ struct wlan_cm_vdev_discon_req {
enum wlan_cm_connect_fail_reason {
CM_NO_CANDIDATE_FOUND,
CM_ABORT_DUE_TO_NEW_REQ_RECVD,
CM_CANDIDATE_SELECT_IND_FAILED,
CM_BSS_SELECT_IND_FAILED,
CM_PEER_CREATE_FAILED,
CM_JOIN_FAILED,
CM_JOIN_TIMEOUT,

6
umac/mlme/connection_mgr/dispatcher/src/wlan_cm_api.c
View file

@ -35,10 +35,10 @@ QDF_STATUS wlan_cm_start_disconnect(struct wlan_objmgr_vdev *vdev,
return cm_disconnect_start_req(vdev, req);
}
QDF_STATUS wlan_cm_candidate_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status)
QDF_STATUS wlan_cm_bss_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
QDF_STATUS status)
{
return cm_candidate_select_ind_rsp(vdev, status);
return cm_bss_select_ind_rsp(vdev, status);
}
QDF_STATUS wlan_cm_bss_peer_create_rsp(struct wlan_objmgr_vdev *vdev,