Browse Source

qcacld-3.0: Rename pHostapdAdapter

The Linux Coding Style frowns upon mixed-case names and so-called
Hungarian notation, so rename pHostapdAdapter to align with the Coding
Style.

Change-Id: I18a74117ae47ad05a1c46b50a14fcb64347f1c07
CRs-Fixed: 2121120
Jeff Johnson 7 years ago
parent
commit
9c4f93d221

+ 3 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -41,6 +41,7 @@
  */
 #define pHddCtx
 #define pAdapter
+#define pHostapdAdapter
 
 /*
  * Include files
@@ -1922,7 +1923,7 @@ void hdd_cleanup_actionframe(struct hdd_context *hdd_ctx,
 			     struct hdd_adapter *adapter);
 
 void crda_regulatory_entry_default(uint8_t *countryCode, int domain_id);
-void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter);
+void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter);
 void hdd_prevent_suspend(uint32_t reason);
 void hdd_allow_suspend(uint32_t reason);
 void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason);
@@ -2288,7 +2289,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 		struct net_device *dev,
 		struct cfg80211_chan_def *chandef,
 		enum nl80211_channel_type channel_type);
-int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *pHostapdAdapter,
+int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		struct cfg80211_beacon_data *params,
 		const u8 *ssid, size_t ssid_len,
 		enum nl80211_hidden_ssid hidden_ssid,

+ 1 - 1
core/hdd/inc/wlan_hdd_softap_tx_rx.h

@@ -67,7 +67,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter,
 				      bool fPrivacyBit);
 QDF_STATUS hdd_softap_deregister_bc_sta(struct hdd_adapter *adapter);
-QDF_STATUS hdd_softap_stop_bss(struct hdd_adapter *pHostapdAdapter);
+QDF_STATUS hdd_softap_stop_bss(struct hdd_adapter *adapter);
 QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
 				       struct qdf_mac_addr *pDestMacAddress,
 				       enum ol_txrx_peer_state state);

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

@@ -13343,9 +13343,9 @@ QDF_STATUS wlan_hdd_validate_operation_channel(struct hdd_adapter *adapter,
 }
 
 #ifdef DHCP_SERVER_OFFLOAD
-static void wlan_hdd_set_dhcp_server_offload(struct hdd_adapter *pHostapdAdapter)
+static void wlan_hdd_set_dhcp_server_offload(struct hdd_adapter *adapter)
 {
-	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
+	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	tpSirDhcpSrvOffloadInfo pDhcpSrvInfo;
 	uint8_t numEntries = 0;
 	uint8_t srv_ip[IPADDR_NUM_ENTRIES];
@@ -13357,7 +13357,7 @@ static void wlan_hdd_set_dhcp_server_offload(struct hdd_adapter *pHostapdAdapter
 		hdd_err("could not allocate tDhcpSrvOffloadInfo!");
 		return;
 	}
-	pDhcpSrvInfo->vdev_id = pHostapdAdapter->sessionId;
+	pDhcpSrvInfo->vdev_id = adapter->sessionId;
 	pDhcpSrvInfo->dhcpSrvOffloadEnabled = true;
 	pDhcpSrvInfo->dhcpClientNum = hdd_ctx->config->dhcpMaxNumClients;
 	hdd_string_to_u8_array(hdd_ctx->config->dhcpServerIP,

File diff suppressed because it is too large
+ 154 - 154
core/hdd/src/wlan_hdd_hostapd.c


+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.h

@@ -131,7 +131,7 @@ int hdd_hostapd_stop(struct net_device *dev);
 int hdd_sap_context_init(struct hdd_context *hdd_ctx);
 void hdd_sap_context_destroy(struct hdd_context *hdd_ctx);
 #ifdef QCA_HT_2040_COEX
-QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *pHostapdAdapter,
+QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *adapter,
 				   uint8_t channel_type);
 #endif
 

+ 7 - 7
core/hdd/src/wlan_hdd_main.c

@@ -4225,17 +4225,17 @@ QDF_STATUS hdd_close_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 	return QDF_STATUS_SUCCESS;
 }
 
-void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter)
+void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter)
 {
 	struct qdf_mac_addr *bssid = NULL;
 	tSirUpdateIE updateIE;
 
-	switch (pHostapdAdapter->device_mode) {
+	switch (adapter->device_mode) {
 	case QDF_STA_MODE:
 	case QDF_P2P_CLIENT_MODE:
 	{
 		struct hdd_station_ctx *pHddStaCtx =
-			WLAN_HDD_GET_STATION_CTX_PTR(pHostapdAdapter);
+			WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		bssid = &pHddStaCtx->conn_info.bssId;
 		break;
 	}
@@ -4243,7 +4243,7 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter)
 	case QDF_P2P_GO_MODE:
 	case QDF_IBSS_MODE:
 	{
-		bssid = &pHostapdAdapter->macAddressCurrent;
+		bssid = &adapter->macAddressCurrent;
 		break;
 	}
 	case QDF_FTM_MODE:
@@ -4254,17 +4254,17 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter)
 		 * for these kind of devices
 		 */
 		hdd_err("Unexpected request for the current device type %d",
-		       pHostapdAdapter->device_mode);
+		       adapter->device_mode);
 		return;
 	}
 
 	qdf_copy_macaddr(&updateIE.bssid, bssid);
-	updateIE.smeSessionId = pHostapdAdapter->sessionId;
+	updateIE.smeSessionId = adapter->sessionId;
 	updateIE.ieBufferlength = 0;
 	updateIE.pAdditionIEBuffer = NULL;
 	updateIE.append = true;
 	updateIE.notify = false;
-	if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(pHostapdAdapter),
+	if (sme_update_add_ie(WLAN_HDD_GET_HAL_CTX(adapter),
 			      &updateIE,
 			      eUPDATE_IE_PROBE_RESP) == QDF_STATUS_E_FAILURE) {
 		hdd_err("Could not pass on PROBE_RSP_BCN data to PE");

Some files were not shown because too many files changed in this diff