qcacld-3.0: Incorporate new MAC handle naming in HDD

Change "qcacld-3.0: Introduce mac_handle_t" introduced a modern name
for what was previously called the tHalHandle. Incorporate the new
name in struct hdd_context, as well as introduce new MAC handle
accessor functions. Future changes will transform the existing
tHalHandle references to mac_handle_t references throughout HDD.

Change-Id: Ic33c5f9332ccda6a7825a2a8521ebb0e66d1ab98
CRs-Fixed: 2261200
This commit is contained in:
Jeff Johnson 2018-06-11 19:13:11 -07:00 • committed by nshrivas
commit b81b2e0182

View file

@ -1416,7 +1416,7 @@ struct hdd_adapter {
#define WLAN_HDD_GET_STATION_CTX_PTR(adapter) (&(adapter)->session.station)
#define WLAN_HDD_GET_AP_CTX_PTR(adapter) (&(adapter)->session.ap)
#define WLAN_HDD_GET_CTX(adapter) ((adapter)->hdd_ctx)
#define WLAN_HDD_GET_HAL_CTX(adapter) ((adapter)->hdd_ctx->hHal)
#define WLAN_HDD_GET_HAL_CTX(adapter) hdd_adapter_get_mac_handle(adapter)
#define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
(&(adapter)->session.ap.hostapd_state)
#define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->session.ap.sap_context)
@ -1641,8 +1641,13 @@ struct hdd_context {
struct wlan_objmgr_psoc *hdd_psoc;
struct wlan_objmgr_pdev *hdd_pdev;
/** HAL handle...*/
tHalHandle hHal;
union {
/** HAL handle...*/
tHalHandle hHal;
/** MAC handle */
mac_handle_t mac_handle;
};
struct wiphy *wiphy;
/* TODO Remove this from here. */
@ -3287,4 +3292,33 @@ void hdd_update_hw_sw_info(struct hdd_context *hdd_ctx);
*/
void hdd_get_nud_stats_cb(void *data, struct rsp_stats *rsp, void *context);
/**
* hdd_context_get_mac_handle() - get mac handle from hdd context
* @hdd_ctx: Global HDD context pointer
*
* Retrieves the global MAC handle from the HDD context
*
* Return: The global MAC handle (which may be NULL)
*/
static inline
mac_handle_t hdd_context_get_mac_handle(struct hdd_context *hdd_ctx)
{
return hdd_ctx ? hdd_ctx->mac_handle : NULL;
}
/**
* hdd_adapter_get_mac_handle() - get mac handle from hdd adapter
* @adapter: HDD adapter pointer
*
* Retrieves the global MAC handle given an HDD adapter
*
* Return: The global MAC handle (which may be NULL)
*/
static inline
mac_handle_t hdd_adapter_get_mac_handle(struct hdd_adapter *adapter)
{
return adapter ?
hdd_context_get_mac_handle(adapter->hdd_ctx) : NULL;
}
#endif /* end #if !defined(WLAN_HDD_MAIN_H) */