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-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename HDD objmgr wrappers

Browse source 
Rename the HDD object manager wrapper functions to better reflect their
relevance to object manager.

Change-Id: Ic12cd192096c9fd89dd19568edfaac72001cd965
CRs-Fixed: 2025251
This commit is contained in:
Dustin Brown 2017-03-27 12:07:36 -07:00 • committed by Sandeep Puligilla
commit 7d043f6fec
7 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1274,14 +1274,14 @@ static void hdd_send_association_event(struct net_device *dev,
chan_info.reg_info_2 =
pCsrRoamInfo->chan_info.reg_info_2;
ret = hdd_add_peer_object(pAdapter->hdd_vdev,
pAdapter->device_mode,
peerMacAddr.bytes);
ret = hdd_objmgr_add_peer_object(pAdapter->hdd_vdev,
pAdapter->device_mode,
peerMacAddr.bytes);
if (ret)
hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
MAC_ADDR_ARRAY(peerMacAddr.bytes));
ret = hdd_set_peer_mlme_state(pAdapter->hdd_vdev,
WLAN_ASSOC_STATE);
ret = hdd_objmgr_set_peer_mlme_state(pAdapter->hdd_vdev,
WLAN_ASSOC_STATE);
if (ret)
hdd_err("Peer object %pM fail to set associated state",
peerMacAddr.bytes);
@ -1317,14 +1317,14 @@ static void hdd_send_association_event(struct net_device *dev,
hdd_err("wlan: new IBSS connection to " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(pHddStaCtx->conn_info.bssId.bytes));
ret = hdd_add_peer_object(pAdapter->hdd_vdev,
QDF_IBSS_MODE,
pCsrRoamInfo->bssid.bytes);
ret = hdd_objmgr_add_peer_object(pAdapter->hdd_vdev,
QDF_IBSS_MODE,
pCsrRoamInfo->bssid.bytes);
if (ret)
hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
MAC_ADDR_ARRAY(pCsrRoamInfo->bssid.bytes));
ret = hdd_set_peer_mlme_state(pAdapter->hdd_vdev,
WLAN_ASSOC_STATE);
ret = hdd_objmgr_set_peer_mlme_state(pAdapter->hdd_vdev,
WLAN_ASSOC_STATE);
if (ret)
hdd_err("Peer object %pM fail to set associated state",
peerMacAddr.bytes);
@ -1352,8 +1352,8 @@ static void hdd_send_association_event(struct net_device *dev,
pAdapter->device_mode);
}
ret = hdd_remove_peer_object(pAdapter->hdd_vdev,
peerMacAddr.bytes);
ret = hdd_objmgr_remove_peer_object(pAdapter->hdd_vdev,
peerMacAddr.bytes);
if (ret)
hdd_err("Peer obj "MAC_ADDRESS_STR" delete fails",
MAC_ADDR_ARRAY(peerMacAddr.bytes));
@ -1466,8 +1466,7 @@ QDF_STATUS hdd_roam_deregister_sta(hdd_adapter_t *adapter, uint8_t staid)
peerMacAddress[staid].bytes;
}
ret = hdd_remove_peer_object(adapter->hdd_vdev,
peer_mac);
ret = hdd_objmgr_remove_peer_object(adapter->hdd_vdev, peer_mac);
if (ret) {
hdd_err("Peer obj %pM delete fails", peer_mac);
return QDF_STATUS_E_FAILURE;

18
core/hdd/src/wlan_hdd_hostapd.c
View file

@ -1721,11 +1721,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
pHostapdAdapter->device_mode);
}
ret = hdd_add_peer_object(pHostapdAdapter->hdd_vdev,
pHostapdAdapter->device_mode,
pSapEvent->sapevt.
sapStationAssocReassocCompleteEvent.
staMac.bytes);
ret = hdd_objmgr_add_peer_object(
pHostapdAdapter->hdd_vdev,
pHostapdAdapter->device_mode,
pSapEvent->sapevt.sapStationAssocReassocCompleteEvent.
staMac.bytes);
if (ret)
hdd_err("Peer object "MAC_ADDRESS_STR" add fails!",
MAC_ADDR_ARRAY(pSapEvent->sapevt.
@ -5959,7 +5959,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
* This is a special case of hdd_vdev_create(). In phase 4 convergence,
* this special case will be properly addressed.
*/
ret = hdd_create_and_store_vdev(pHddCtx->hdd_pdev, pAdapter);
ret = hdd_objmgr_create_and_store_vdev(pHddCtx->hdd_pdev, pAdapter);
if (ret) {
hdd_err("failed to create objmgr vdev: %d", ret);
return QDF_STATUS_E_FAILURE;
@ -5976,7 +5976,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter, bool reinit)
* In this case, we need to cleanup in the same order as create.
* See hdd_vdev_create() for more details.
*/
QDF_BUG(!hdd_release_and_destroy_vdev(pAdapter));
QDF_BUG(!hdd_objmgr_release_and_destroy_vdev(pAdapter));
return status;
}
@ -6070,7 +6070,7 @@ error_wmm_init:
hdd_softap_deinit_tx_rx(pAdapter);
error_init_ap_mode:
QDF_BUG(!hdd_release_and_destroy_vdev(pAdapter));
QDF_BUG(!hdd_objmgr_release_and_destroy_vdev(pAdapter));
wlansap_close(sapContext);
pAdapter->sessionCtx.ap.sapContext = NULL;
@ -6246,7 +6246,7 @@ QDF_STATUS hdd_unregister_hostapd(hdd_adapter_t *pAdapter, bool rtnl_held)
hdd_err("Failed:WLANSAP_close");
pAdapter->sessionCtx.ap.sapContext = NULL;
ret = hdd_release_and_destroy_vdev(pAdapter);
ret = hdd_objmgr_release_and_destroy_vdev(pAdapter);
if (ret)
hdd_err("vdev delete failed");

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

@ -1400,7 +1400,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
uint8_t temp_band_cap;
struct cds_config_info *cds_cfg = cds_get_ini_config();
ret = hdd_create_and_store_pdev(hdd_ctx);
ret = hdd_objmgr_create_and_store_pdev(hdd_ctx);
if (ret) {
hdd_err("pdev creation fails!");
QDF_BUG(0);
@ -1963,7 +1963,8 @@ int hdd_wlan_start_modules(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
goto hif_close;
}
ret = hdd_create_and_store_psoc(hdd_ctx, DEFAULT_PSOC_ID);
ret = hdd_objmgr_create_and_store_psoc(hdd_ctx,
DEFAULT_PSOC_ID);
if (ret) {
hdd_err("Psoc creation fails!");
goto ol_cds_free;
@ -2054,7 +2055,7 @@ close:
cds_close(hdd_ctx->hdd_psoc, p_cds_context);
destroy_psoc_object:
hdd_release_and_destroy_psoc(hdd_ctx);
hdd_objmgr_release_and_destroy_psoc(hdd_ctx);
ol_cds_free:
ol_cds_free();
@ -2915,7 +2916,7 @@ int hdd_vdev_destroy(hdd_adapter_t *adapter)
}
/* do vdev create via objmgr */
errno = hdd_release_and_destroy_vdev(adapter);
errno = hdd_objmgr_release_and_destroy_vdev(adapter);
if (errno) {
hdd_err("failed to destroy objmgr vdev: %d", errno);
return errno;
@ -2968,7 +2969,7 @@ int hdd_vdev_create(hdd_adapter_t *adapter)
/* do vdev create via objmgr */
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
errno = hdd_create_and_store_vdev(hdd_ctx->hdd_pdev, adapter);
errno = hdd_objmgr_create_and_store_vdev(hdd_ctx->hdd_pdev, adapter);
if (errno) {
hdd_err("failed to create objmgr vdev: %d", errno);
return errno;
@ -3012,7 +3013,7 @@ int hdd_vdev_create(hdd_adapter_t *adapter)
*/
objmgr_vdev_destroy:
QDF_BUG(!hdd_release_and_destroy_vdev(adapter));
QDF_BUG(!hdd_objmgr_release_and_destroy_vdev(adapter));
return errno;
@ -3248,7 +3249,7 @@ static void hdd_cleanup_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
return;
}
ret = hdd_release_and_destroy_vdev(adapter);
ret = hdd_objmgr_release_and_destroy_vdev(adapter);
if (ret)
hdd_err("vdev delete failed");
@ -3890,7 +3891,7 @@ static void hdd_wait_for_sme_close_sesion(hdd_context_t *hdd_ctx,
clear_bit(SME_SESSION_OPENED, &adapter->event_flags);
return;
}
ret = hdd_release_and_destroy_vdev(adapter);
ret = hdd_objmgr_release_and_destroy_vdev(adapter);
if (ret)
hdd_err("vdev delete failed");
@ -8824,11 +8825,11 @@ int hdd_wlan_stop_modules(hdd_context_t *hdd_ctx)
QDF_ASSERT(0);
}
ret = hdd_release_and_destroy_pdev(hdd_ctx);
ret = hdd_objmgr_release_and_destroy_pdev(hdd_ctx);
if (ret)
hdd_err("Pdev delete failed");
ret = hdd_release_and_destroy_psoc(hdd_ctx);
ret = hdd_objmgr_release_and_destroy_psoc(hdd_ctx);
if (ret)
hdd_err("Psoc delete failed");

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

@ -151,7 +151,7 @@ static int hdd_close_ndi(hdd_adapter_t *adapter)
if (!rc)
hdd_err("session close timeout");
rc = hdd_release_and_destroy_vdev(adapter);
rc = hdd_objmgr_release_and_destroy_vdev(adapter);
if (rc)
hdd_err("vdev delete failed");
}

33
core/hdd/src/wlan_hdd_object_manager.c
View file

@ -63,7 +63,7 @@ static void hdd_init_psoc_qdf_ctx(struct wlan_objmgr_psoc *psoc)
wlan_psoc_set_qdf_dev(psoc, qdf_ctx);
}
int hdd_create_and_store_psoc(hdd_context_t *hdd_ctx, uint8_t psoc_id)
int hdd_objmgr_create_and_store_psoc(hdd_context_t *hdd_ctx, uint8_t psoc_id)
{
struct wlan_objmgr_psoc *psoc;
@ -77,7 +77,7 @@ int hdd_create_and_store_psoc(hdd_context_t *hdd_ctx, uint8_t psoc_id)
return 0;
}
int hdd_release_and_destroy_psoc(hdd_context_t *hdd_ctx)
int hdd_objmgr_release_and_destroy_psoc(hdd_context_t *hdd_ctx)
{
struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
@ -90,7 +90,7 @@ int hdd_release_and_destroy_psoc(hdd_context_t *hdd_ctx)
return qdf_status_to_os_return(wlan_objmgr_psoc_obj_delete(psoc));
}
int hdd_create_and_store_pdev(hdd_context_t *hdd_ctx)
int hdd_objmgr_create_and_store_pdev(hdd_context_t *hdd_ctx)
{
struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
struct wlan_objmgr_pdev *pdev;
@ -118,7 +118,7 @@ int hdd_create_and_store_pdev(hdd_context_t *hdd_ctx)
return 0;
}
int hdd_release_and_destroy_pdev(hdd_context_t *hdd_ctx)
int hdd_objmgr_release_and_destroy_pdev(hdd_context_t *hdd_ctx)
{
struct wlan_objmgr_pdev *pdev = hdd_ctx->hdd_pdev;
struct pdev_osif_priv *osif_priv;
@ -134,8 +134,8 @@ int hdd_release_and_destroy_pdev(hdd_context_t *hdd_ctx)
return qdf_status_to_os_return(wlan_objmgr_pdev_obj_delete(pdev));
}
int hdd_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
hdd_adapter_t *adapter)
int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
hdd_adapter_t *adapter)
{
struct wlan_objmgr_vdev *vdev;
struct wlan_objmgr_peer *peer;
@ -180,7 +180,7 @@ int hdd_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
return 0;
}
int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter)
int hdd_objmgr_release_and_destroy_vdev(hdd_adapter_t *adapter)
{
struct wlan_objmgr_vdev *vdev;
struct vdev_osif_priv *osif_priv;
@ -195,7 +195,8 @@ int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter)
adapter->hdd_vdev = NULL;
adapter->sessionId = HDD_SESSION_ID_INVALID;
if (hdd_remove_peer_object(vdev, wlan_vdev_mlme_get_macaddr(vdev))) {
if (hdd_objmgr_remove_peer_object(vdev,
wlan_vdev_mlme_get_macaddr(vdev))) {
hdd_err("Self peer delete failed");
return -EINVAL;
}
@ -203,9 +204,9 @@ int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter)
return qdf_status_to_os_return(wlan_objmgr_vdev_obj_delete(vdev));
}
int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
enum tQDF_ADAPTER_MODE adapter_mode,
uint8_t *mac_addr)
int hdd_objmgr_add_peer_object(struct wlan_objmgr_vdev *vdev,
enum tQDF_ADAPTER_MODE adapter_mode,
uint8_t *mac_addr)
{
enum wlan_peer_type peer_type;
struct wlan_objmgr_peer *peer;
@ -234,13 +235,13 @@ int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
return -ENOMEM;
hdd_info("Peer object "MAC_ADDRESS_STR" add success!",
MAC_ADDR_ARRAY(mac_addr));
MAC_ADDR_ARRAY(mac_addr));
return 0;
}
int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
uint8_t *mac_addr)
int hdd_objmgr_remove_peer_object(struct wlan_objmgr_vdev *vdev,
uint8_t *mac_addr)
{
struct wlan_objmgr_psoc *psoc;
struct wlan_objmgr_peer *peer;
@ -276,8 +277,8 @@ int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
return -EINVAL;
}
int hdd_set_peer_mlme_state(struct wlan_objmgr_vdev *vdev,
enum wlan_peer_state peer_state)
int hdd_objmgr_set_peer_mlme_state(struct wlan_objmgr_vdev *vdev,
enum wlan_peer_state peer_state)
{
struct wlan_objmgr_peer *peer;

44
core/hdd/src/wlan_hdd_object_manager.h
View file

@ -64,7 +64,7 @@
#include <wlan_objmgr_peer_obj.h>
/**
* hdd_create_and_store_psoc() - Create psoc object and store in hdd context
* hdd_objmgr_create_and_store_psoc() - Create psoc and store in hdd context
* @hdd_ctx: Hdd context
* @psoc_id: Psoc Id
*
@ -73,40 +73,40 @@
*
* Return: 0 for success, negative error code for failure
*/
int hdd_create_and_store_psoc(hdd_context_t *hdd_ctx, uint8_t psoc_id);
int hdd_objmgr_create_and_store_psoc(hdd_context_t *hdd_ctx, uint8_t psoc_id);
/**
* hdd_release_and_destroy_psoc() - Deletes the psoc object
* hdd_objmgr_release_and_destroy_psoc() - Deletes the psoc object
* @hdd_ctx: Hdd context
*
* This API deletes psoc object and release its reference from hdd context
*
* Return: 0 for success, negative error code for failure
*/
int hdd_release_and_destroy_psoc(hdd_context_t *hdd_ctx);
int hdd_objmgr_release_and_destroy_psoc(hdd_context_t *hdd_ctx);
/**
* hdd_create_and_store_pdev() - Create pdev object and store in hdd context
* hdd_objmgr_create_and_store_pdev() - Create pdev and store in hdd context
* @hdd_ctx: Hdd context
*
* This API creates the pdev object and store the pdev reference to hdd context
*
* Return: 0 for success, negative error code for failure
*/
int hdd_create_and_store_pdev(hdd_context_t *hdd_ctx);
int hdd_objmgr_create_and_store_pdev(hdd_context_t *hdd_ctx);
/**
* hdd_release_and_destroy_pdev() - Deletes the pdev object
* hdd_objmgr_release_and_destroy_pdev() - Deletes the pdev object
* @hdd_ctx: Hdd context
*
* This API deletes pdev object and release its reference from hdd context
*
* Return: 0 for success, negative error code for failure
*/
int hdd_release_and_destroy_pdev(hdd_context_t *hdd_ctx);
int hdd_objmgr_release_and_destroy_pdev(hdd_context_t *hdd_ctx);
/**
* hdd_create_and_store_vdev() - Create vdev object and store in hdd adapter
* hdd_objmgr_create_and_store_vdev() - Create vdev and store in hdd adapter
* @pdev: pdev pointer
* @adapter: hdd adapter
*
@ -115,21 +115,21 @@ int hdd_release_and_destroy_pdev(hdd_context_t *hdd_ctx);
*
* Return: 0 for success, negative error code for failure
*/
int hdd_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
hdd_adapter_t *adapter);
/**
* hdd_release_and_destroy_vdev() - Delete the vdev object
* hdd_objmgr_release_and_destroy_vdev() - Delete vdev and remove from adapter
* @hdd_ctx: Hdd context
*
* This API deletes vdev object and release its reference from hdd adapter
*
* Return: 0 for success, negative error code for failure
*/
int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter);
int hdd_objmgr_release_and_destroy_vdev(hdd_adapter_t *adapter);
/**
* hdd_add_peer_object() - Create and add the peer object to the vdev
* hdd_objmgr_add_peer_object() - Create and add the peer to the vdev
* @vdev: vdev pointer
* @adapter_mode: adapter mode
* @mac_addr: Peer mac address
@ -140,12 +140,12 @@ int hdd_release_and_destroy_vdev(hdd_adapter_t *adapter);
*
* Return: 0 for success, negative error code for failure
*/
int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
enum tQDF_ADAPTER_MODE adapter_mode,
uint8_t *mac_addr);
int hdd_objmgr_add_peer_object(struct wlan_objmgr_vdev *vdev,
enum tQDF_ADAPTER_MODE adapter_mode,
uint8_t *mac_addr);
/**
* hdd_remove_peer_object() - Delete and remove the peer from vdev
* hdd_objmgr_remove_peer_object() - Delete and remove the peer from vdev
* @vdev: vdev pointer
* @mac_addr: Peer Mac address
*
@ -153,11 +153,11 @@ int hdd_add_peer_object(struct wlan_objmgr_vdev *vdev,
*
* Return: 0 for success, negative error code for failure
*/
int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
uint8_t *mac_addr);
int hdd_objmgr_remove_peer_object(struct wlan_objmgr_vdev *vdev,
uint8_t *mac_addr);
/**
* hdd_set_peer_mlme_state() - set the peer mlme state
* hdd_objmgr_set_peer_mlme_state() - set the peer mlme state
* @vdev: vdev pointer
* @peer_state: Peer mlme state
*
@ -165,7 +165,7 @@ int hdd_remove_peer_object(struct wlan_objmgr_vdev *vdev,
*
* Return: 0 for success, negative error code for failure
*/
int hdd_set_peer_mlme_state(struct wlan_objmgr_vdev *vdev,
enum wlan_peer_state peer_state);
int hdd_objmgr_set_peer_mlme_state(struct wlan_objmgr_vdev *vdev,
enum wlan_peer_state peer_state);
#endif /* end #if !defined(WLAN_HDD_OBJECT_MANAGER_H) */

5
core/hdd/src/wlan_hdd_softap_tx_rx.c
View file

@ -788,8 +788,9 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId)
staId, qdf_status, qdf_status);
}
ret = hdd_remove_peer_object(pAdapter->hdd_vdev,
pAdapter->aStaInfo[staId].macAddrSTA.bytes);
ret = hdd_objmgr_remove_peer_object(pAdapter->hdd_vdev,
pAdapter->aStaInfo[staId].
macAddrSTA.bytes);
if (ret)
hdd_err("Peer obj %pM delete fails",
pAdapter->aStaInfo[staId].macAddrSTA.bytes);