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

qcacmn: Remove #ifdef WLAN_FEATURE_INTERFACE_MGR from connection mgr

Browse Source 
Remove #ifdef WLAN_FEATURE_INTERFACE_MGR from connection mgr, as
interface manager .h files take care of it.

Change-Id: I5b1e07beecd93c98429318372ed72fdf414712a4
CRs-fixed: 2878656
This commit is contained in:
Abhishek Singh
2021-02-15 11:02:18 +05:30
committed by snandini
parent 017c719e4b
commit 1c177a9a31
4 changed files with 15 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
umac/cmn_services/interface_mgr/inc/wlan_if_mgr_api.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -21,12 +21,12 @@
#ifndef _WLAN_IF_MGR_API_H_
#define _WLAN_IF_MGR_API_H_
#ifdef WLAN_FEATURE_INTERFACE_MGR
#include "wlan_objmgr_psoc_obj.h"
#include "wlan_objmgr_vdev_obj.h"
#include "wlan_if_mgr_public_struct.h"
#ifdef WLAN_FEATURE_INTERFACE_MGR
/**
* if_mgr_deliver_event() - interface mgr event handler
* @vdev: vdev object
@@ -39,6 +39,7 @@ QDF_STATUS if_mgr_deliver_event(struct wlan_objmgr_vdev *vdev,
enum wlan_if_mgr_evt event,
struct if_mgr_event_data *event_data);
#else
static inline
QDF_STATUS if_mgr_deliver_event(struct wlan_objmgr_vdev *vdev,
enum wlan_if_mgr_evt event,
struct if_mgr_event_data *event_data)

37
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c
View File

@@ -948,8 +948,8 @@ static QDF_STATUS cm_connect_get_candidates(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_SUCCESS;
}
#ifdef WLAN_FEATURE_INTERFACE_MGR
static QDF_STATUS cm_validate_candidate(struct cnx_mgr *cm_ctx,
static
QDF_STATUS cm_if_mgr_validate_candidate(struct cnx_mgr *cm_ctx,
struct scan_cache_entry *scan_entry)
{
struct if_mgr_event_data event_data = {0};
@@ -964,7 +964,7 @@ static QDF_STATUS cm_validate_candidate(struct cnx_mgr *cm_ctx,
}
static QDF_STATUS
cm_inform_if_mgr_connect_complete(struct wlan_objmgr_vdev *vdev,
cm_if_mgr_inform_connect_complete(struct wlan_objmgr_vdev *vdev,
QDF_STATUS connect_status)
{
struct if_mgr_event_data *connect_complete;
@@ -982,34 +982,11 @@ cm_inform_if_mgr_connect_complete(struct wlan_objmgr_vdev *vdev,
}
static QDF_STATUS
cm_inform_if_mgr_connect_start(struct wlan_objmgr_vdev *vdev)
cm_if_mgr_inform_connect_start(struct wlan_objmgr_vdev *vdev)
{
return if_mgr_deliver_event(vdev, WLAN_IF_MGR_EV_CONNECT_START, NULL);
}
#else
static inline
QDF_STATUS cm_validate_candidate(struct cnx_mgr *cm_ctx,
struct scan_cache_entry *scan_entry)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS
cm_inform_if_mgr_connect_complete(struct wlan_objmgr_vdev *vdev,
QDF_STATUS connect_status)
{
return QDF_STATUS_SUCCESS;
}
static inline QDF_STATUS
cm_inform_if_mgr_connect_start(struct wlan_objmgr_vdev *vdev)
{
return QDF_STATUS_SUCCESS;
}
#endif
QDF_STATUS
cm_handle_connect_req_in_non_init_state(struct cnx_mgr *cm_ctx,
struct cm_connect_req *cm_req,
@@ -1115,7 +1092,7 @@ QDF_STATUS cm_connect_start(struct cnx_mgr *cm_ctx,
* this is called from Scan for ssid
*/
if (!cm_req->scan_id) {
cm_inform_if_mgr_connect_start(cm_ctx->vdev);
cm_if_mgr_inform_connect_start(cm_ctx->vdev);
status = mlme_cm_connect_start_ind(cm_ctx->vdev, &cm_req->req);
if (QDF_IS_STATUS_ERROR(status)) {
reason = CM_NO_CANDIDATE_FOUND;
@@ -1217,7 +1194,7 @@ static QDF_STATUS cm_get_valid_candidate(struct cnx_mgr *cm_ctx,
cur_node, &next_node);
scan_node = qdf_container_of(cur_node, struct scan_cache_node,
node);
status = cm_validate_candidate(cm_ctx, scan_node->entry);
status = cm_if_mgr_validate_candidate(cm_ctx, scan_node->entry);
if (QDF_IS_STATUS_SUCCESS(status)) {
new_candidate = scan_node;
break;
@@ -1604,7 +1581,7 @@ QDF_STATUS cm_connect_complete(struct cnx_mgr *cm_ctx,
mlme_cm_connect_complete_ind(cm_ctx->vdev, resp);
mlme_cm_osif_connect_complete(cm_ctx->vdev, resp);
cm_inform_if_mgr_connect_complete(cm_ctx->vdev, resp->connect_status);
cm_if_mgr_inform_connect_complete(cm_ctx->vdev, resp->connect_status);
cm_inform_blm_connect_complete(cm_ctx->vdev, resp);
/* Update scan entry in case connect is success or fails with bssid */

21
umac/mlme/connection_mgr/core/src/wlan_cm_disconnect.c
View File

@@ -245,9 +245,8 @@ static QDF_STATUS cm_ser_disconnect_req(struct wlan_objmgr_pdev *pdev,
return QDF_STATUS_SUCCESS;
}
#ifdef WLAN_FEATURE_INTERFACE_MGR
static void
cm_inform_if_mgr_disconnect_complete(struct wlan_objmgr_vdev *vdev)
cm_if_mgr_inform_disconnect_complete(struct wlan_objmgr_vdev *vdev)
{
struct if_mgr_event_data *disconnect_complete;
@@ -263,7 +262,7 @@ cm_inform_if_mgr_disconnect_complete(struct wlan_objmgr_vdev *vdev)
}
static void
cm_inform_if_mgr_disconnect_start(struct wlan_objmgr_vdev *vdev)
cm_if_mgr_inform_disconnect_start(struct wlan_objmgr_vdev *vdev)
{
struct if_mgr_event_data *disconnect_start;
@@ -278,18 +277,6 @@ cm_inform_if_mgr_disconnect_start(struct wlan_objmgr_vdev *vdev)
qdf_mem_free(disconnect_start);
}
#else
static inline void
cm_inform_if_mgr_disconnect_complete(struct wlan_objmgr_vdev *vdev)
{
}
static inline void
cm_inform_if_mgr_disconnect_start(struct wlan_objmgr_vdev *vdev)
{
}
#endif
void cm_initiate_internal_disconnect(struct cnx_mgr *cm_ctx)
{
struct cm_req *cm_req;
@@ -330,7 +317,7 @@ QDF_STATUS cm_disconnect_start(struct cnx_mgr *cm_ctx,
}
cm_vdev_scan_cancel(pdev, cm_ctx->vdev);
mlme_cm_disconnect_start_ind(cm_ctx->vdev, &req->req);
cm_inform_if_mgr_disconnect_start(cm_ctx->vdev);
cm_if_mgr_inform_disconnect_start(cm_ctx->vdev);
mlme_cm_osif_disconnect_start_ind(cm_ctx->vdev);
/* Serialize disconnect req, Handle failure status */
@@ -471,7 +458,7 @@ QDF_STATUS cm_disconnect_complete(struct cnx_mgr *cm_ctx,
mlme_cm_disconnect_complete_ind(cm_ctx->vdev, resp);
mlme_cm_osif_disconnect_complete(cm_ctx->vdev, resp);
wlan_crypto_free_vdev_key(cm_ctx->vdev);
cm_inform_if_mgr_disconnect_complete(cm_ctx->vdev);
cm_if_mgr_inform_disconnect_complete(cm_ctx->vdev);
cm_inform_blm_disconnect_complete(cm_ctx->vdev, resp);
/*

2
umac/mlme/connection_mgr/core/src/wlan_cm_main_api.h
View File

@@ -27,9 +27,7 @@
#include "wlan_cm_sm.h"
#include <include/wlan_mlme_cmn.h>
#include <wlan_crypto_global_api.h>
#ifdef WLAN_FEATURE_INTERFACE_MGR
#include <wlan_if_mgr_api.h>
#endif
#ifdef WLAN_CM_USE_SPINLOCK
#include <scheduler_api.h>
#endif