qcacld-3.0: Replace hdd_context_t in wlan_hdd_assoc.[ch]
The Linux Coding Style enumerates a few special cases where typedefs
are useful, but stresses "NEVER EVER use a typedef unless you can
clearly match one of those rules." The hdd_context_t typedef does not
meet any of those criteria, so replace references to it with a
reference to the underlying struct.
Change-Id: Iadc364f1abf3159f7c258a01fd11628a86fcf820
CRs-Fixed: 2100215
diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index b2c75ea..bdb3876 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -214,7 +214,6 @@
/* Forward declarations */
typedef struct hdd_adapter hdd_adapter_t;
-typedef struct hdd_context hdd_context_t;
typedef struct hdd_station_ctx hdd_station_ctx_t;
typedef struct hdd_ap_ctx hdd_ap_ctx_t;
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 790808d..b61cfac 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -164,7 +164,7 @@
hdd_conn_set_authenticated(hdd_adapter_t *pAdapter, uint8_t authState)
{
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
/* save the new connection state */
hdd_debug("Authenticated state Changed from oldState:%d to State:%d",
@@ -188,7 +188,7 @@
eConnectionState conn_state)
{
hdd_station_ctx_t *hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
/* save the new connection state */
hdd_debug("%pS Changed conn state from old:%d to new:%d for dev %s",
@@ -310,7 +310,7 @@
static int hdd_remove_beacon_filter(hdd_adapter_t *adapter)
{
QDF_STATUS status;
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
status = sme_remove_beacon_filter(hdd_ctx->hHal,
adapter->sessionId);
@@ -333,7 +333,7 @@
int i;
uint32_t ie_map[SIR_BCN_FLT_MAX_ELEMS_IE_LIST] = {0};
QDF_STATUS status;
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
for (i = 0; i < ARRAY_SIZE(beacon_filter_table); i++)
qdf_set_bit((beacon_filter_table[i]),
@@ -1011,7 +1011,7 @@
{
uint16_t auth_resp_len = 0;
uint32_t ric_ies_length = 0;
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
#if defined(KERNEL_SUPPORT_11R_CFG80211)
struct cfg80211_ft_event_params ftEvent;
@@ -1227,7 +1227,7 @@
{
int ret;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
union iwreq_data wrqu;
int we_event;
@@ -1602,7 +1602,7 @@
QDF_STATUS status = QDF_STATUS_SUCCESS;
QDF_STATUS vstatus;
struct net_device *dev = pAdapter->dev;
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
uint8_t sta_id;
bool sendDisconInd = true;
@@ -1797,7 +1797,7 @@
*/
static void hdd_set_peer_authorized_event(uint32_t vdev_id)
{
- hdd_context_t *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
+ struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
hdd_adapter_t *adapter = NULL;
adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
@@ -1911,14 +1911,14 @@
struct cdp_vdev *data_vdev;
QDF_STATUS status = QDF_STATUS_SUCCESS;
void *soc = cds_get_context(QDF_MODULE_ID_SOC);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
struct wlan_objmgr_psoc **psoc;
if (!cbk_data)
return status;
psoc = cbk_data;
- hdd_ctx = container_of(psoc, hdd_context_t, hdd_psoc);
+ hdd_ctx = container_of(psoc, struct hdd_context, hdd_psoc);
if (!hdd_ctx->tdls_nap_active)
return status;
@@ -2107,7 +2107,7 @@
uint8_t *final_req_ie = NULL;
tCsrRoamConnectedProfile roam_profile;
tHalHandle hal_handle = WLAN_HDD_GET_HAL_CTX(pAdapter);
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
qdf_mem_zero(&roam_profile, sizeof(roam_profile));
@@ -2288,7 +2288,7 @@
uint32_t timeout;
uint8_t staid = HDD_WLAN_INVALID_STA_ID;
hdd_station_ctx_t *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
timeout = hddstactx->hdd_ReassocScenario ?
AUTO_PS_ENTRY_TIMER_DEFAULT_VALUE :
@@ -2534,7 +2534,7 @@
eCsrRoamResult roamResult)
{
struct net_device *dev = pAdapter->dev;
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
uint8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN];
@@ -3225,7 +3225,7 @@
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
{
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
hdd_debug("%s: id %d, status %d, result %d",
pAdapter->dev->name, roamId,
@@ -3237,8 +3237,8 @@
case eCSR_ROAM_RESULT_IBSS_JOIN_SUCCESS:
case eCSR_ROAM_RESULT_IBSS_COALESCED:
{
- hdd_context_t *pHddCtx =
- (hdd_context_t *) pAdapter->pHddCtx;
+ struct hdd_context *pHddCtx =
+ (struct hdd_context *) pAdapter->pHddCtx;
hdd_station_ctx_t *hdd_sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
struct qdf_mac_addr broadcastMacAddr =
@@ -3588,7 +3588,7 @@
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
{
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
QDF_STATUS qdf_status;
switch (roamResult) {
@@ -3814,7 +3814,7 @@
tdlsCtx_t *hdd_tdls_ctx)
{
hddTdlsPeer_t *curr_peer;
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
curr_peer = wlan_hdd_tdls_find_peer(adapter,
roam_info->peerMac.bytes);
@@ -3881,7 +3881,7 @@
eRoamCmdStatus roamStatus,
eCsrRoamResult roamResult)
{
- hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+ struct hdd_context *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
tdlsCtx_t *pHddTdlsCtx;
tSmeTdlsPeerStateParams smeTdlsPeerStateParams;
QDF_STATUS status = QDF_STATUS_E_FAILURE;
@@ -4895,7 +4895,7 @@
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct wiphy *wiphy = wdev->wiphy;
QDF_STATUS status;
- hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
hdd_debug("channel switch for session:%d to channel:%d",
adapter->sessionId, roam_info->chan_info.chan_id);
@@ -4947,7 +4947,7 @@
hdd_station_ctx_t *pHddStaCtx = NULL;
QDF_STATUS status = QDF_STATUS_SUCCESS;
struct cfg80211_bss *bss_status;
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_debug("CSR Callback: status= %d result= %d roamID=%d",
roamStatus, roamResult, roamId);
@@ -5861,7 +5861,7 @@
uint32_t status = 0;
hdd_wext_state_t *pWextState;
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
uint32_t roamId;
tCsrRoamProfile *pRoamProfile;
eCsrAuthType RSNAuthType;
@@ -6088,7 +6088,7 @@
struct iw_point *dwrq, char *extra)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_wext_state_t *wextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
int ret;
@@ -6159,7 +6159,7 @@
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
@@ -6395,7 +6395,7 @@
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
tCsrRoamProfile *pRoamProfile = &pWextState->roamProfile;
int ret;
@@ -6556,7 +6556,7 @@
{
hdd_adapter_t *adapter;
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_station_ctx_t *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(WLAN_HDD_GET_PRIV_PTR(dev));
uint8_t *pMacAddress = NULL;
@@ -6621,7 +6621,7 @@
union iwreq_data *wrqu, char *extra)
{
hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_context_t *hdd_ctx;
+ struct hdd_context *hdd_ctx;
hdd_station_ctx_t *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(adapter);
int ret;