Browse Source

qcacld-3.0: Replace tpAniSirGlobal in HDD

Typedef tpAniSirGlobal is obsolete, so replace it with the underlying
struct pointer or handle conversion function as appropriate.

Change-Id: I4dd5d91f54bfb57d6322a5e3c91795b80393da8a
CRs-Fixed: 2347908
Jeff Johnson 6 years ago
parent
commit
034f3c92a8

+ 3 - 2
core/hdd/src/wlan_hdd_assoc.c

@@ -5228,8 +5228,9 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 		pRsnIe = gen_ie + 2 + 4;
 		RSNIeLen = gen_ie_len - (2 + 4);
 		/* Unpack the WPA IE */
-		parse_status = dot11f_unpack_ie_wpa((tpAniSirGlobal)mac_handle,
-				     pRsnIe, RSNIeLen, &dot11WPAIE, false);
+		parse_status = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
+						    pRsnIe, RSNIeLen,
+						    &dot11WPAIE, false);
 		if (!DOT11F_SUCCEEDED(parse_status)) {
 			hdd_err("Invalid WPA IE: parse status %d",
 				parse_status);

+ 1 - 1
core/hdd/src/wlan_hdd_cfg80211.c

@@ -17291,7 +17291,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 					return -EINVAL;
 				}
 				ret = dot11f_unpack_ie_wpa(
-						(tpAniSirGlobal) mac_handle,
+						MAC_CONTEXT(mac_handle),
 						(uint8_t *)&ie[2 + 4],
 						ie[1] - 4, &dot11WPAIE, false);
 				if (DOT11F_FAILED(ret)) {

+ 4 - 3
core/hdd/src/wlan_hdd_hostapd.c

@@ -2667,8 +2667,9 @@ static int hdd_softap_unpack_ie(mac_handle_t mac_handle,
 		RSNIeLen = gen_ie_len - (2 + 4);
 		/* Unpack the WPA IE */
 		memset(&dot11WPAIE, 0, sizeof(tDot11fIEWPA));
-		ret = dot11f_unpack_ie_wpa((tpAniSirGlobal) mac_handle,
-				     pRsnIe, RSNIeLen, &dot11WPAIE, false);
+		ret = dot11f_unpack_ie_wpa(MAC_CONTEXT(mac_handle),
+					   pRsnIe, RSNIeLen,
+					   &dot11WPAIE, false);
 		if (DOT11F_FAILED(ret)) {
 			hdd_err("unpack failed, ret: 0x%x", ret);
 			return -EINVAL;
@@ -3305,7 +3306,7 @@ static bool wlan_hdd_get_sap_obss(struct hdd_adapter *adapter)
 					beacon->tail, beacon->tail_len);
 	if (ie && ie[1]) {
 		qdf_mem_copy(ht_cap_ie, &ie[2], DOT11F_IE_HTCAPS_MAX_LEN);
-		ret = dot11f_unpack_ie_ht_caps((tpAniSirGlobal)mac_handle,
+		ret = dot11f_unpack_ie_ht_caps(MAC_CONTEXT(mac_handle),
 					       ht_cap_ie, ie[1],
 					       &dot11_ht_cap_ie, false);
 		if (DOT11F_FAILED(ret)) {

+ 3 - 3
core/hdd/src/wlan_hdd_stats.c

@@ -541,7 +541,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx;
 	mac_handle_t mac_handle = adapter->hdd_ctx->mac_handle;
 	/* pre-existing layering violation */
-	tpAniSirGlobal pMac = MAC_CONTEXT(mac_handle);
+	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 
 	pInfo->mode = hdd_map_device_to_ll_iface_mode(adapter->device_mode);
 
@@ -588,10 +588,10 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 	}
 
 	qdf_mem_copy(pInfo->countryStr,
-		     pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN);
+		     mac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN);
 
 	qdf_mem_copy(pInfo->apCountryStr,
-		     pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN);
+		     mac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN);
 
 	return true;
 }

+ 3 - 2
core/hdd/src/wlan_hdd_wext.c

@@ -4161,7 +4161,7 @@ static int hdd_we_set_data_inactivity_timeout(struct hdd_adapter *adapter,
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	mac_handle_t mac_handle = hdd_ctx->mac_handle;
-	tpAniSirGlobal mac_ctx;
+	struct mac_context *mac_ctx;
 
 	if (!mac_handle)
 		return -EINVAL;
@@ -4171,7 +4171,8 @@ static int hdd_we_set_data_inactivity_timeout(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}
 
-	mac_ctx = PMAC_STRUCT(mac_handle);
+	/* pre-existing layering violation */
+	mac_ctx = MAC_CONTEXT(mac_handle);
 	mac_ctx->mlme_cfg->timeouts.ps_data_inactivity_timeout = value;
 
 	return 0;