From ee56b4491c3f449d40fbb6ce4f51e39edeec8c1d Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 20 May 2018 11:29:42 -0700 Subject: [PATCH] qcacmn: Replace new instances of tQDF_ADAPTER_MODE Previously change "qcacmn: Use enum QDF_OPMODE", Change-Id Ic6f663dac11a100f168b2626c7c0fbcaccbfca4f, replaced all instances of tQDF_ADAPTER_MODE to QDF_OPMODE in the qca-wifi-host-cmn project. However since tQDF_ADAPTER_MODE was originally defined in a common project, and not all references to it could be immediately removed, a legacy definition was left with the expectation that it would be removed when all references to it had been updated. Unfortunately new instances of using tQDF_ADAPTER_MODE have been subsequently added to the project, so replace them with QDF_OPMODE. Change-Id: I71cead84151cc0411f7cc5cc13a87a281e7502c0 CRs-Fixed: 2245249 --- inc/wlan_policy_mgr_api.h | 2 +- src/wlan_policy_mgr_action.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/wlan_policy_mgr_api.h b/inc/wlan_policy_mgr_api.h index 32b30d2f9e7f..044708767b71 100644 --- a/inc/wlan_policy_mgr_api.h +++ b/inc/wlan_policy_mgr_api.h @@ -827,7 +827,7 @@ struct policy_mgr_hdd_cbacks { enum policy_mgr_con_mode (*get_mode_for_non_connected_vdev)( struct wlan_objmgr_psoc *psoc, uint8_t vdev_id); - enum tQDF_ADAPTER_MODE (*hdd_get_device_mode)(uint32_t session_id); + enum QDF_OPMODE (*hdd_get_device_mode)(uint32_t session_id); }; diff --git a/src/wlan_policy_mgr_action.c b/src/wlan_policy_mgr_action.c index e8fefe16ae1c..b50712b35d4d 100644 --- a/src/wlan_policy_mgr_action.c +++ b/src/wlan_policy_mgr_action.c @@ -362,7 +362,7 @@ static bool policy_mgr_is_dbs_allowed_for_concurrency( { struct policy_mgr_psoc_priv_obj *pm_ctx; uint32_t count, dbs_for_sta_sta, dbs_for_sta_p2p; - enum tQDF_ADAPTER_MODE new_conn_mode = QDF_MAX_NO_OF_MODE; + enum QDF_OPMODE new_conn_mode = QDF_MAX_NO_OF_MODE; bool ret = true; pm_ctx = policy_mgr_get_context(psoc);