qcacld-3.0: Replace hdd_adapter_t in wlan_hdd_main.[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_adapter_t typedef does not
meet any of those criteria, so replace references to it with a
reference to the underlying struct.

Change-Id: Ica1ce65d05f81f51c3ec04fa4ef3d022c9319886
CRs-Fixed: 2101065

core/hdd/inc/wlan_hdd_main.h

@@ -247,7 +247,7 @@
 		hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "enter(%s)", (dev)->name)
 #define EXIT() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "exit")
 
-#define WLAN_HDD_GET_PRIV_PTR(__dev__) (hdd_adapter_t *)(netdev_priv((__dev__)))
+#define WLAN_HDD_GET_PRIV_PTR(__dev__) (struct hdd_adapter *)(netdev_priv((__dev__)))
 
 #define MAX_NO_OF_2_4_CHANNELS 14
 
@@ -634,7 +634,7 @@ typedef struct hdd_remain_on_chan_ctx {
 /* RoC Request entry */
 typedef struct hdd_roc_req {
 	qdf_list_node_t node;   /* MUST be first element */
-	hdd_adapter_t *pAdapter;
+	struct hdd_adapter *pAdapter;
 	hdd_remain_on_chan_ctx_t *pRemainChanCtx;
 } hdd_roc_req_t;
 
@@ -652,7 +652,7 @@ typedef struct hdd_roc_req {
  */
 struct hdd_scan_req {
 	qdf_list_node_t node;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	struct cfg80211_scan_request *scan_request;
 	uint32_t scan_id;
 	uint8_t source;
@@ -1353,7 +1353,7 @@ struct hdd_adapter {
 
 typedef struct hdd_adapter_list_node {
 	qdf_list_node_t node;   /* MUST be first element */
-	hdd_adapter_t *pAdapter;
+	struct hdd_adapter *pAdapter;
 } hdd_adapter_list_node_t;
 
 /*
@@ -1529,7 +1529,7 @@ struct hdd_context {
 	/* One per STA: 1 for BCMC_STA_ID, 1 for each SAP_SELF_STA_ID,
 	 * 1 for WDS_STAID
 	 */
-	hdd_adapter_t *sta_to_adapter[WLAN_MAX_STA_COUNT + QDF_MAX_NO_OF_SAP_MODE + 2];
+	struct hdd_adapter *sta_to_adapter[WLAN_MAX_STA_COUNT + QDF_MAX_NO_OF_SAP_MODE + 2];
 
 	/** Pointer for firmware image data */
 	const struct firmware *fw;
@@ -1804,7 +1804,7 @@ struct hdd_context {
 	/* indicate whether it's now capturing tsf(updating tstamp-pair) */
 	qdf_atomic_t cap_tsf_flag;
 	/* the context that is capturing tsf */
-	hdd_adapter_t *cap_tsf_context;
+	struct hdd_adapter *cap_tsf_context;
 #endif
 	uint8_t bt_a2dp_active:1;
 	uint8_t bt_vo_active:1;
@@ -1834,7 +1834,7 @@ struct hdd_vendor_acs_chan_params {
  */
 struct hdd_external_acs_timer_context {
 	int8_t reason;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 };
 
 /**
@@ -1886,7 +1886,7 @@ struct hdd_channel_info {
 /*
  * Function declarations and documentation
  */
-int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter,
+int hdd_validate_channel_and_bandwidth(struct hdd_adapter *adapter,
 				uint32_t chan_number,
 				enum phy_ch_width chan_bw);
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
@@ -1914,32 +1914,32 @@ QDF_STATUS hdd_add_adapter_back(struct hdd_context *pHddCtx,
 QDF_STATUS hdd_add_adapter_front(struct hdd_context *pHddCtx,
 				 hdd_adapter_list_node_t *pAdapterNode);
 
-hdd_adapter_t *hdd_open_adapter(struct hdd_context *pHddCtx, uint8_t session_type,
+struct hdd_adapter *hdd_open_adapter(struct hdd_context *pHddCtx, uint8_t session_type,
 				const char *name, tSirMacAddr macAddr,
 				unsigned char name_assign_type,
 				bool rtnl_held);
-QDF_STATUS hdd_close_adapter(struct hdd_context *pHddCtx, hdd_adapter_t *pAdapter,
+QDF_STATUS hdd_close_adapter(struct hdd_context *pHddCtx, struct hdd_adapter *pAdapter,
 			     bool rtnl_held);
 QDF_STATUS hdd_close_all_adapters(struct hdd_context *pHddCtx, bool rtnl_held);
 QDF_STATUS hdd_stop_all_adapters(struct hdd_context *pHddCtx);
 void hdd_deinit_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held);
 QDF_STATUS hdd_reset_all_adapters(struct hdd_context *pHddCtx);
 QDF_STATUS hdd_start_all_adapters(struct hdd_context *pHddCtx);
-hdd_adapter_t *hdd_get_adapter_by_vdev(struct hdd_context *pHddCtx,
+struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *pHddCtx,
 				       uint32_t vdev_id);
-hdd_adapter_t *hdd_get_adapter_by_macaddr(struct hdd_context *pHddCtx,
+struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *pHddCtx,
 					  tSirMacAddr macAddr);
 
-int hdd_vdev_create(hdd_adapter_t *adapter);
-int hdd_vdev_destroy(hdd_adapter_t *adapter);
-int hdd_vdev_ready(hdd_adapter_t *adapter);
+int hdd_vdev_create(struct hdd_adapter *adapter);
+int hdd_vdev_destroy(struct hdd_adapter *adapter);
+int hdd_vdev_ready(struct hdd_adapter *adapter);
 
-QDF_STATUS hdd_init_station_mode(hdd_adapter_t *pAdapter);
-hdd_adapter_t *hdd_get_adapter(struct hdd_context *pHddCtx,
+QDF_STATUS hdd_init_station_mode(struct hdd_adapter *pAdapter);
+struct hdd_adapter *hdd_get_adapter(struct hdd_context *pHddCtx,
 			enum tQDF_ADAPTER_MODE mode);
-void hdd_deinit_adapter(struct hdd_context *pHddCtx, hdd_adapter_t *pAdapter,
+void hdd_deinit_adapter(struct hdd_context *pHddCtx, struct hdd_adapter *pAdapter,
 			bool rtnl_held);
-QDF_STATUS hdd_stop_adapter(struct hdd_context *pHddCtx, hdd_adapter_t *pAdapter,
+QDF_STATUS hdd_stop_adapter(struct hdd_context *pHddCtx, struct hdd_adapter *pAdapter,
 			    const bool bCloseSession);
 void hdd_set_station_ops(struct net_device *pWlanDev);
 uint8_t *wlan_hdd_get_intf_addr(struct hdd_context *pHddCtx);
@@ -1950,16 +1950,16 @@ uint8_t hdd_get_operating_channel(struct hdd_context *pHddCtx,
 void hdd_set_conparam(uint32_t con_param);
 enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void);
 
-void hdd_cleanup_actionframe(struct hdd_context *pHddCtx, hdd_adapter_t *pAdapter);
+void hdd_cleanup_actionframe(struct hdd_context *pHddCtx, struct hdd_adapter *pAdapter);
 
 void crda_regulatory_entry_default(uint8_t *countryCode, int domain_id);
-void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter);
+void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter);
 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);
 
 void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy);
-QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter);
+QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *pAdapter);
 QDF_STATUS wlan_hdd_restart_driver(struct hdd_context *pHddCtx);
 void hdd_exchange_version_and_caps(struct hdd_context *pHddCtx);
 int wlan_hdd_validate_context(struct hdd_context *pHddCtx);
@@ -1972,7 +1972,7 @@ int wlan_hdd_validate_context(struct hdd_context *pHddCtx);
  *
  * Return: Errno
  */
-int hdd_validate_adapter(hdd_adapter_t *adapter);
+int hdd_validate_adapter(struct hdd_adapter *adapter);
 
 /**
  * wlan_hdd_validate_context_in_loading() - check the HDD context in loading
@@ -1987,7 +1987,7 @@ QDF_STATUS hdd_issta_p2p_clientconnected(struct hdd_context *pHddCtx);
 bool wlan_hdd_validate_modules_state(struct hdd_context *hdd_ctx);
 
 struct qdf_mac_addr *
-hdd_wlan_get_ibss_mac_addr_from_staid(hdd_adapter_t *pAdapter,
+hdd_wlan_get_ibss_mac_addr_from_staid(struct hdd_adapter *pAdapter,
 				      uint8_t staIdx);
 void hdd_checkandupdate_phymode(struct hdd_context *pHddCtx);
 #ifdef MSM_PLATFORM
@@ -2066,7 +2066,7 @@ static inline void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx
 {
 }
 
-static inline void hdd_stop_bus_bw_computer_timer(hdd_adapter_t *pAdapter)
+static inline void hdd_stop_bus_bw_computer_timer(struct hdd_adapter *pAdapter)
 {
 }
 
@@ -2089,7 +2089,7 @@ int hdd_wlan_startup(struct device *dev);
 void __hdd_wlan_exit(void);
 int hdd_wlan_notify_modem_power_state(int state);
 #ifdef QCA_HT_2040_COEX
-int hdd_wlan_set_ht2040_mode(hdd_adapter_t *pAdapter, uint16_t staId,
+int hdd_wlan_set_ht2040_mode(struct hdd_adapter *pAdapter, uint16_t staId,
 			     struct qdf_mac_addr macAddrSTA, int width);
 #endif
 
@@ -2098,12 +2098,12 @@ void wlan_hdd_send_svc_nlink_msg(int radio, int type, void *data, int len);
 void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable);
 #endif
 
-hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter,
+struct hdd_adapter *hdd_get_con_sap_adapter(struct hdd_adapter *this_sap_adapter,
 							bool check_start_bss);
 
 bool hdd_is_5g_supported(struct hdd_context *pHddCtx);
 
-int wlan_hdd_scan_abort(hdd_adapter_t *pAdapter);
+int wlan_hdd_scan_abort(struct hdd_adapter *pAdapter);
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static inline bool roaming_offload_enabled(struct hdd_context *hdd_ctx)
@@ -2171,7 +2171,7 @@ void hdd_acs_response_timeout_handler(void *context);
  *
  * Return: Status of ACS Start procedure
  */
-int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter);
+int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter);
 
 /**
  * hdd_cfg80211_update_acs_config() - update acs config to application
@@ -2180,7 +2180,7 @@ int wlan_hdd_cfg80211_start_acs(hdd_adapter_t *adapter);
  *
  * Return: none
  */
-void hdd_cfg80211_update_acs_config(hdd_adapter_t *adapter,
+void hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 				    uint8_t reason);
 /**
  * hdd_update_acs_timer_reason() - update acs timer start reason
@@ -2189,7 +2189,7 @@ void hdd_cfg80211_update_acs_config(hdd_adapter_t *adapter,
  *
  * Return: 0 for success
  */
-int hdd_update_acs_timer_reason(hdd_adapter_t *adapter, uint8_t reason);
+int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason);
 
 /**
  * hdd_switch_sap_channel() - Move SAP to the given channel
@@ -2201,7 +2201,7 @@ int hdd_update_acs_timer_reason(hdd_adapter_t *adapter, uint8_t reason);
  *
  * Return: None
  */
-void hdd_switch_sap_channel(hdd_adapter_t *adapter, uint8_t channel);
+void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel);
 #ifdef WLAN_FEATURE_MEMDUMP
 /**
  * hdd_is_memdump_supported() - to check if memdump feature support
@@ -2224,20 +2224,20 @@ static inline bool hdd_is_memdump_supported(void)
 
 void hdd_update_macaddr(struct hdd_config *config,
 			struct qdf_mac_addr hw_macaddr);
-void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter);
-void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter);
+void wlan_hdd_disable_roaming(struct hdd_adapter *pAdapter);
+void wlan_hdd_enable_roaming(struct hdd_adapter *pAdapter);
 
 QDF_STATUS hdd_post_cds_enable_config(struct hdd_context *pHddCtx);
 
 QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx);
 
-QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
-						  hdd_adapter_t *ap_adapter,
+QDF_STATUS wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter,
+						  struct hdd_adapter *ap_adapter,
 						  tCsrRoamProfile *roam_profile,
 						  tScanResultHandle *scan_cache,
 						  bool *concurrent_chnl_same);
-void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter);
-void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter, bool reinit);
+void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter);
+void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit);
 
 void wlan_hdd_soc_set_antenna_mode_cb(enum set_antenna_mode_status status);
 
@@ -2256,7 +2256,7 @@ void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx);
 void wlan_hdd_txrx_pause_cb(uint8_t vdev_id,
 	enum netif_action_type action, enum netif_reason_type reason);
 
-int hdd_wlan_dump_stats(hdd_adapter_t *adapter, int value);
+int hdd_wlan_dump_stats(struct hdd_adapter *adapter, int value);
 void wlan_hdd_deinit_tx_rx_histogram(struct hdd_context *hdd_ctx);
 void wlan_hdd_display_tx_rx_histogram(struct hdd_context *pHddCtx);
 void wlan_hdd_clear_tx_rx_histogram(struct hdd_context *pHddCtx);
@@ -2264,7 +2264,7 @@ void wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx);
 void wlan_hdd_clear_netif_queue_history(struct hdd_context *hdd_ctx);
 const char *hdd_get_fwpath(void);
 void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind);
-hdd_adapter_t *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
 						uint32_t sme_session_id);
 /**
  * hdd_get_adapter_by_iface_name() - Return adapter with given interface name
@@ -2276,7 +2276,7 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
  * Return: adapter pointer if found, NULL otherwise
  *
  */
-hdd_adapter_t *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
 					     const char *iface_name);
 enum phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width);
 uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel,
@@ -2292,7 +2292,7 @@ int hdd_update_config(struct hdd_context *hdd_ctx);
  */
 int hdd_update_components_config(struct hdd_context *hdd_ctx);
 
-QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *adapter,
+QDF_STATUS hdd_chan_change_notify(struct hdd_adapter *adapter,
 		struct net_device *dev,
 		struct hdd_chan_change_params chan_change,
 		bool legacy_phymode);
@@ -2300,7 +2300,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(hdd_adapter_t *pHostapdAdapter,
+int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *pHostapdAdapter,
 		struct cfg80211_beacon_data *params,
 		const u8 *ssid, size_t ssid_len,
 		enum nl80211_hidden_ssid hidden_ssid,
@@ -2359,9 +2359,9 @@ static inline void hdd_set_tso_flags(struct hdd_context *hdd_ctx,
 
 #if defined(FEATURE_WLAN_MCC_TO_SCC_SWITCH) || \
 	defined(FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE)
-void wlan_hdd_restart_sap(hdd_adapter_t *ap_adapter);
+void wlan_hdd_restart_sap(struct hdd_adapter *ap_adapter);
 #else
-static inline void wlan_hdd_restart_sap(hdd_adapter_t *ap_adapter)
+static inline void wlan_hdd_restart_sap(struct hdd_adapter *ap_adapter)
 {
 }
 #endif
@@ -2410,20 +2410,20 @@ static inline int wlan_hdd_nl_init(struct hdd_context *hdd_ctx)
 #endif
 QDF_STATUS hdd_sme_close_session_callback(void *pContext);
 
-int hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid,
+int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 		uint8_t channel, const handoff_src src);
 void hdd_svc_fw_shutdown_ind(struct device *dev);
 int hdd_register_cb(struct hdd_context *hdd_ctx);
 void hdd_deregister_cb(struct hdd_context *hdd_ctx);
-int hdd_start_station_adapter(hdd_adapter_t *adapter);
-int hdd_start_ap_adapter(hdd_adapter_t *adapter);
-int hdd_configure_cds(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter);
-int hdd_start_ftm_adapter(hdd_adapter_t *adapter);
-int hdd_set_fw_params(hdd_adapter_t *adapter);
-int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+int hdd_start_station_adapter(struct hdd_adapter *adapter);
+int hdd_start_ap_adapter(struct hdd_adapter *adapter);
+int hdd_configure_cds(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter);
+int hdd_start_ftm_adapter(struct hdd_adapter *adapter);
+int hdd_set_fw_params(struct hdd_adapter *adapter);
+int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 			   bool reinit);
 int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode);
-int hdd_start_adapter(hdd_adapter_t *adapter);
+int hdd_start_adapter(struct hdd_adapter *adapter);
 void hdd_populate_random_mac_addr(struct hdd_context *hdd_ctx, uint32_t num);
 
 /**
@@ -2497,7 +2497,7 @@ bool hdd_local_unsafe_channel_updated(struct hdd_context *hdd_ctx,
 
 int hdd_enable_disable_ca_event(struct hdd_context *hddctx,
 				uint8_t set_value);
-void wlan_hdd_undo_acs(hdd_adapter_t *adapter);
+void wlan_hdd_undo_acs(struct hdd_adapter *adapter);
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
 static inline int
@@ -2521,11 +2521,11 @@ static inline int wlan_hdd_validate_session_id(u8 session_id)
 	return -EINVAL;
 }
 
-bool hdd_is_roaming_in_progress(hdd_adapter_t *adapter);
+bool hdd_is_roaming_in_progress(struct hdd_adapter *adapter);
 void hdd_set_roaming_in_progress(bool value);
 bool hdd_is_connection_in_progress(uint8_t *session_id,
 	enum scan_reject_states *reason);
-void hdd_restart_sap(hdd_adapter_t *ap_adapter);
+void hdd_restart_sap(struct hdd_adapter *ap_adapter);
 void hdd_check_and_restart_sap_with_non_dfs_acs(void);
 bool hdd_set_connection_in_progress(bool value);
 
@@ -2541,7 +2541,7 @@ bool hdd_set_connection_in_progress(bool value);
  *
  * Return: Zero on success, non-zero on failure
  */
-int wlan_hdd_sap_get_valid_channellist(hdd_adapter_t *adapter,
+int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter,
 				       uint32_t *channel_count,
 				       uint8_t *channel_list,
 				       eCsrBand band);
@@ -2564,7 +2564,7 @@ void wlan_hdd_init_chan_info(struct hdd_context *hdd_ctx);
  * Return: None
  */
 void wlan_hdd_deinit_chan_info(struct hdd_context *hdd_ctx);
-void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter, bool reinit);
+void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit);
 
 /**
  * hdd_check_for_opened_interfaces()- Check for interface up
@@ -2645,7 +2645,7 @@ static inline void hdd_send_peer_status_ind_to_app(
  *
  * Return: 0 sucess else failure
  */
-int wlan_hdd_send_p2p_quota(hdd_adapter_t *adapter, int sval);
+int wlan_hdd_send_p2p_quota(struct hdd_adapter *adapter, int sval);
 
 /**
  * wlan_hdd_send_p2p_quota()- Send MCC latency to FW
@@ -2656,7 +2656,7 @@ int wlan_hdd_send_p2p_quota(hdd_adapter_t *adapter, int sval);
  *
  * Return: 0 sucess else failure
  */
-int wlan_hdd_send_mcc_latency(hdd_adapter_t *adapter, int sval);
+int wlan_hdd_send_mcc_latency(struct hdd_adapter *adapter, int sval);
 
 /**
  * wlan_hdd_get_adapter_from_vdev()- Get adapter from vdev id
@@ -2668,7 +2668,7 @@ int wlan_hdd_send_mcc_latency(hdd_adapter_t *adapter, int sval);
  *
  * Return: adapter pointer
  */
-hdd_adapter_t *wlan_hdd_get_adapter_from_vdev(struct wlan_objmgr_psoc
+struct hdd_adapter *wlan_hdd_get_adapter_from_vdev(struct wlan_objmgr_psoc
 					*psoc, uint8_t vdev_id);
 /**
  * hdd_unregister_notifiers()- unregister kernel notifiers
@@ -2739,7 +2739,7 @@ void hdd_update_ie_whitelist_attr(struct probe_req_whitelist_attr *ie_whitelist,
  *
  * Return: QDF_STATUS
  */
-int hdd_get_rssi_snr_by_bssid(hdd_adapter_t *adapter, const uint8_t *bssid,
+int hdd_get_rssi_snr_by_bssid(struct hdd_adapter *adapter, const uint8_t *bssid,
 			      int8_t *rssi, int8_t *snr);
 
 #if defined(WLAN_FEATURE_FILS_SK) && defined(CFG80211_FILS_SK_OFFLOAD_SUPPORT)
@@ -2750,9 +2750,9 @@ int hdd_get_rssi_snr_by_bssid(hdd_adapter_t *adapter, const uint8_t *bssid,
  *
  * Return: None
  */
-void hdd_clear_fils_connection_info(hdd_adapter_t *adapter);
+void hdd_clear_fils_connection_info(struct hdd_adapter *adapter);
 #else
-static inline void hdd_clear_fils_connection_info(hdd_adapter_t *adapter)
+static inline void hdd_clear_fils_connection_info(struct hdd_adapter *adapter)
 { }
 #endif
 

core/hdd/src/wlan_hdd_main.c

@@ -278,7 +278,7 @@ void hdd_start_complete(int ret)
  */
 static void hdd_set_rps_cpu_mask(struct hdd_context *hdd_ctx)
 {
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	hdd_adapter_list_node_t *adapter_node, *next;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
@@ -304,7 +304,7 @@ void wlan_hdd_txrx_pause_cb(uint8_t vdev_id,
 		enum netif_action_type action, enum netif_reason_type reason)
 {
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	if (!hdd_ctx) {
 		hdd_err("hdd ctx is NULL");
@@ -363,7 +363,7 @@ const char *hdd_device_mode_to_string(uint8_t device_mode)
  *
  * Return: 0 for success, non-zero for failure
  */
-int hdd_validate_channel_and_bandwidth(hdd_adapter_t *adapter,
+int hdd_validate_channel_and_bandwidth(struct hdd_adapter *adapter,
 		uint32_t chan_number,
 		enum phy_ch_width chan_bw)
 {
@@ -433,7 +433,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb,
 #else
 	struct net_device *dev = data;
 #endif
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx;
 
 	ENTER_DEV(dev);
@@ -712,7 +712,7 @@ int wlan_hdd_validate_context(struct hdd_context *hdd_ctx)
 	return 0;
 }
 
-int hdd_validate_adapter(hdd_adapter_t *adapter)
+int hdd_validate_adapter(struct hdd_adapter *adapter)
 {
 	if (!adapter) {
 		hdd_err("adapter is null");
@@ -772,7 +772,7 @@ bool wlan_hdd_validate_modules_state(struct hdd_context *hdd_ctx)
 
 /**
  * hdd_set_ibss_power_save_params() - update IBSS Power Save params to WMA.
- * @hdd_adapter_t Hdd adapter.
+ * @struct hdd_adapter Hdd adapter.
  *
  * This function sets the IBSS power save config parameters to WMA
  * which will send it to firmware if FW supports IBSS power save
@@ -781,7 +781,7 @@ bool wlan_hdd_validate_modules_state(struct hdd_context *hdd_ctx)
  * Return: QDF_STATUS QDF_STATUS_SUCCESS on Success and QDF_STATUS_E_FAILURE
  *         on failure.
  */
-QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
+QDF_STATUS hdd_set_ibss_power_save_params(struct hdd_adapter *adapter)
 {
 	int ret;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -1717,7 +1717,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 bool hdd_dfs_indicate_radar(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS status;
 	struct hdd_ap_ctx *ap_ctx;
 
@@ -1855,7 +1855,7 @@ static int hdd_mon_open(struct net_device *dev)
  *
  * Return: 0 for success; non-zero for failure
  */
-int hdd_start_adapter(hdd_adapter_t *adapter)
+int hdd_start_adapter(struct hdd_adapter *adapter)
 {
 
 	int ret;
@@ -2070,7 +2070,7 @@ hdd_update_cds_ac_specs_params(struct hdd_context *hdd_ctx)
 static enum policy_mgr_con_mode wlan_hdd_get_mode_for_non_connected_vdev(
 			struct wlan_objmgr_psoc *psoc, uint8_t vdev_id)
 {
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
@@ -2142,7 +2142,7 @@ static void hdd_nan_register_callbacks(struct hdd_context *hdd_ctx)
  *
  * Return: 0 for success; non-zero for failure
  */
-int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+int hdd_wlan_start_modules(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 			   bool reinit)
 {
 	int ret;
@@ -2399,7 +2399,7 @@ static void hdd_populate_wifi_pos_cfg(struct hdd_context *hdd_ctx)
  */
 static int __hdd_open(struct net_device *dev)
 {
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int ret;
 
@@ -2486,7 +2486,7 @@ static int hdd_open(struct net_device *dev)
  */
 static int __hdd_stop(struct net_device *dev)
 {
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int ret;
 
@@ -2594,7 +2594,7 @@ static int hdd_stop(struct net_device *dev)
  */
 static void __hdd_uninit(struct net_device *dev)
 {
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
 	ENTER_DEV(dev);
 
@@ -2688,7 +2688,7 @@ static void hdd_close_cesium_nl_sock(void)
  */
 static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 {
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx;
 	struct sockaddr *psta_mac_addr = addr;
 	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
@@ -2772,7 +2772,7 @@ void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx, uint8_t *releaseAdd
  */
 static void __hdd_set_multicast_list(struct net_device *dev)
 {
-	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	int i = 0, status;
 	struct netdev_hw_addr *ha;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -2952,14 +2952,14 @@ static void hdd_runtime_suspend_context_deinit(struct hdd_context *hdd_ctx)
 	wlan_scan_runtime_pm_deinit(hdd_ctx->hdd_pdev);
 }
 
-static void hdd_adapter_runtime_suspend_init(hdd_adapter_t *adapter)
+static void hdd_adapter_runtime_suspend_init(struct hdd_adapter *adapter)
 {
 	struct hdd_connect_pm_context *ctx = &adapter->connect_rpm_ctx;
 
 	qdf_runtime_lock_init(&ctx->connect);
 }
 
-static void hdd_adapter_runtime_suspend_denit(hdd_adapter_t *adapter)
+static void hdd_adapter_runtime_suspend_denit(struct hdd_adapter *adapter)
 {
 	struct hdd_connect_pm_context *ctx = &adapter->connect_rpm_ctx;
 
@@ -2968,8 +2968,8 @@ static void hdd_adapter_runtime_suspend_denit(hdd_adapter_t *adapter)
 #else /* FEATURE_RUNTIME_PM */
 static void hdd_runtime_suspend_context_init(struct hdd_context *hdd_ctx) {}
 static void hdd_runtime_suspend_context_deinit(struct hdd_context *hdd_ctx) {}
-static inline void hdd_adapter_runtime_suspend_init(hdd_adapter_t *adapter) {}
-static inline void hdd_adapter_runtime_suspend_denit(hdd_adapter_t *adapter) {}
+static inline void hdd_adapter_runtime_suspend_init(struct hdd_adapter *adapter) {}
+static inline void hdd_adapter_runtime_suspend_denit(struct hdd_adapter *adapter) {}
 #endif /* FEATURE_RUNTIME_PM */
 /**
  * hdd_alloc_station_adapter() - allocate the station hdd adapter
@@ -2982,18 +2982,18 @@ static inline void hdd_adapter_runtime_suspend_denit(hdd_adapter_t *adapter) {}
  *
  * Return: the pointer to hdd adapter, otherwise NULL
  */
-static hdd_adapter_t *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx,
+static struct hdd_adapter *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx,
 						tSirMacAddr macAddr,
 						unsigned char name_assign_type,
 						const char *name)
 {
 	struct net_device *pWlanDev = NULL;
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	struct hdd_station_ctx *sta_ctx;
 	/*
 	 * cfg80211 initialization and registration....
 	 */
-	pWlanDev = alloc_netdev_mq(sizeof(hdd_adapter_t), name,
+	pWlanDev = alloc_netdev_mq(sizeof(struct hdd_adapter), name,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
 				   name_assign_type,
 #endif
@@ -3004,9 +3004,9 @@ static hdd_adapter_t *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx,
 	if (pWlanDev != NULL) {
 
 		/* Save the pointer to the net_device in the HDD adapter */
-		adapter = (hdd_adapter_t *) netdev_priv(pWlanDev);
+		adapter = (struct hdd_adapter *) netdev_priv(pWlanDev);
 
-		qdf_mem_zero(adapter, sizeof(hdd_adapter_t));
+		qdf_mem_zero(adapter, sizeof(struct hdd_adapter));
 		sta_ctx = &adapter->sessionCtx.station;
 		qdf_mem_set(sta_ctx->conn_info.staId,
 			sizeof(sta_ctx->conn_info.staId),
@@ -3076,7 +3076,7 @@ static hdd_adapter_t *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx,
 	return adapter;
 }
 
-static QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, bool rtnl_held)
+static QDF_STATUS hdd_register_interface(struct hdd_adapter *adapter, bool rtnl_held)
 {
 	struct net_device *dev = adapter->dev;
 	int ret;
@@ -3118,7 +3118,7 @@ static QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter, bool rtnl_held)
 
 QDF_STATUS hdd_sme_close_session_callback(void *pContext)
 {
-	hdd_adapter_t *adapter = pContext;
+	struct hdd_adapter *adapter = pContext;
 
 	if (NULL == adapter) {
 		hdd_err("NULL adapter");
@@ -3162,7 +3162,7 @@ QDF_STATUS hdd_sme_close_session_callback(void *pContext)
  * Return: QDF_STATUS
  */
 #ifdef FEATURE_WLAN_TDLS
-static QDF_STATUS hdd_check_and_init_tdls(hdd_adapter_t *adapter)
+static QDF_STATUS hdd_check_and_init_tdls(struct hdd_adapter *adapter)
 {
 	if (adapter->device_mode == QDF_IBSS_MODE)
 		return QDF_STATUS_SUCCESS;
@@ -3176,13 +3176,13 @@ static QDF_STATUS hdd_check_and_init_tdls(hdd_adapter_t *adapter)
 	return QDF_STATUS_SUCCESS;
 }
 #else
-static QDF_STATUS hdd_check_and_init_tdls(hdd_adapter_t *adapter)
+static QDF_STATUS hdd_check_and_init_tdls(struct hdd_adapter *adapter)
 {
 	return QDF_STATUS_SUCCESS;
 }
 #endif
 
-int hdd_vdev_ready(hdd_adapter_t *adapter)
+int hdd_vdev_ready(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 
@@ -3202,7 +3202,7 @@ int hdd_vdev_ready(hdd_adapter_t *adapter)
 	return qdf_status_to_os_return(status);
 }
 
-int hdd_vdev_destroy(hdd_adapter_t *adapter)
+int hdd_vdev_destroy(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 	int errno;
@@ -3265,7 +3265,7 @@ release_vdev:
 	return 0;
 }
 
-int hdd_vdev_create(hdd_adapter_t *adapter)
+int hdd_vdev_create(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 	int errno;
@@ -3340,7 +3340,7 @@ hdd_vdev_destroy:
 	return errno;
 }
 
-QDF_STATUS hdd_init_station_mode(hdd_adapter_t *adapter)
+QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 {
 	struct hdd_station_ctx *pHddStaCtx = &adapter->sessionCtx.station;
 	struct hdd_context *hdd_ctx;
@@ -3425,7 +3425,7 @@ error_register_wext:
 	return status;
 }
 
-void hdd_cleanup_actionframe(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter)
+void hdd_cleanup_actionframe(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter)
 {
 	hdd_cfg80211_state_t *cfgState;
 
@@ -3460,7 +3460,7 @@ void hdd_cleanup_actionframe(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter
  * Return: None.
  */
 static void hdd_station_adapter_deinit(struct hdd_context *hdd_ctx,
-				       hdd_adapter_t *adapter,
+				       struct hdd_adapter *adapter,
 				       bool rtnl_held)
 {
 	ENTER_DEV(adapter->dev);
@@ -3501,7 +3501,7 @@ static void hdd_station_adapter_deinit(struct hdd_context *hdd_ctx,
  * Return: None.
  */
 static void hdd_ap_adapter_deinit(struct hdd_context *hdd_ctx,
-				  hdd_adapter_t *adapter,
+				  struct hdd_adapter *adapter,
 				  bool rtnl_held)
 {
 	ENTER_DEV(adapter->dev);
@@ -3519,7 +3519,7 @@ static void hdd_ap_adapter_deinit(struct hdd_context *hdd_ctx,
 	EXIT();
 }
 
-void hdd_deinit_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+void hdd_deinit_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 			bool rtnl_held)
 {
 	ENTER();
@@ -3548,7 +3548,7 @@ void hdd_deinit_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
 	EXIT();
 }
 
-static void hdd_cleanup_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+static void hdd_cleanup_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 				bool rtnl_held)
 {
 	struct net_device *pWlanDev = NULL;
@@ -3596,7 +3596,7 @@ static QDF_STATUS hdd_check_for_existing_macaddr(struct hdd_context *hdd_ctx,
 						 tSirMacAddr macAddr)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS status;
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapterNode);
@@ -3624,7 +3624,7 @@ static QDF_STATUS hdd_check_for_existing_macaddr(struct hdd_context *hdd_ctx,
  * Return: None
  */
 static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
-				  hdd_adapter_t *adapter)
+				  struct hdd_adapter *adapter)
 {
 	uint8_t count = 0, numentries = 0,
 			moduleloglevel[FW_MODULE_LOG_LEVEL_STRING_LENGTH];
@@ -3706,7 +3706,7 @@ static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
 }
 #else
 static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
-				  hdd_adapter_t *adapter)
+				  struct hdd_adapter *adapter)
 {
 }
 
@@ -3721,7 +3721,7 @@ static void hdd_set_fw_log_params(struct hdd_context *hdd_ctx,
  *
  * Return: 0 on success or errno on failure
  */
-int hdd_set_fw_params(hdd_adapter_t *adapter)
+int hdd_set_fw_params(struct hdd_adapter *adapter)
 {
 	int ret;
 	struct hdd_context *hdd_ctx;
@@ -3868,12 +3868,12 @@ error:
  *
  * Return: the pointer of hdd adapter, otherwise NULL.
  */
-hdd_adapter_t *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t session_type,
+struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t session_type,
 				const char *iface_name, tSirMacAddr macAddr,
 				unsigned char name_assign_type,
 				bool rtnl_held)
 {
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	hdd_adapter_list_node_t *pHddAdapterNode = NULL;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	hdd_cfg80211_state_t *cfgState;
@@ -4081,7 +4081,7 @@ err_free_netdev:
 	return NULL;
 }
 
-QDF_STATUS hdd_close_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+QDF_STATUS hdd_close_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 			     bool rtnl_held)
 {
 	hdd_adapter_list_node_t *adapterNode, *pCurrent, *pNext;
@@ -4164,7 +4164,7 @@ QDF_STATUS hdd_close_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 	return QDF_STATUS_SUCCESS;
 }
 
-void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
+void wlan_hdd_reset_prob_rspies(struct hdd_adapter *pHostapdAdapter)
 {
 	struct qdf_mac_addr *bssid = NULL;
 	tSirUpdateIE updateIE;
@@ -4210,7 +4210,7 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter)
 	}
 }
 
-QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter,
+QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
 			    const bool bCloseSession)
 {
 	QDF_STATUS qdf_ret_status = QDF_STATUS_SUCCESS;
@@ -4414,7 +4414,7 @@ void  hdd_deinit_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 {
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	ENTER();
 
@@ -4434,7 +4434,7 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	ENTER();
 
@@ -4458,7 +4458,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	struct hdd_station_ctx *pHddStaCtx;
 	struct qdf_mac_addr peerMacAddr;
 
@@ -4577,7 +4577,7 @@ bool hdd_check_for_opened_interfaces(struct hdd_context *hdd_ctx)
  *
  * Return: 0 if interface was opened else false
  */
-static bool hdd_is_interface_up(hdd_adapter_t *adapter)
+static bool hdd_is_interface_up(struct hdd_adapter *adapter)
 {
 	if (test_bit(DEVICE_IFACE_OPENED, &adapter->event_flags))
 		return true;
@@ -4947,7 +4947,7 @@ void hdd_connect_result(struct net_device *dev, const u8 *bssid,
 			bool connect_timeout,
 			tSirResultCodes timeout_reason)
 {
-	hdd_adapter_t *padapter = (hdd_adapter_t *) netdev_priv(dev);
+	struct hdd_adapter *padapter = (struct hdd_adapter *) netdev_priv(dev);
 	struct cfg80211_bss *bss = NULL;
 
 	if (WLAN_STATUS_SUCCESS == status) {
@@ -4988,7 +4988,7 @@ void hdd_connect_result(struct net_device *dev, const u8 *bssid,
 			bool connect_timeout,
 			tSirResultCodes timeout_reason)
 {
-	hdd_adapter_t *padapter = (hdd_adapter_t *) netdev_priv(dev);
+	struct hdd_adapter *padapter = (struct hdd_adapter *) netdev_priv(dev);
 
 	cfg80211_connect_result(dev, bssid, req_ie, req_ie_len,
 				resp_ie, resp_ie_len, status, gfp);
@@ -5003,7 +5003,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 #ifndef MSM_PLATFORM
 	struct qdf_mac_addr bcastMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 #endif
@@ -5187,11 +5187,11 @@ QDF_STATUS hdd_add_adapter_front(struct hdd_context *hdd_ctx,
 	return status;
 }
 
-hdd_adapter_t *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
 					  tSirMacAddr macAddr)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS status;
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapterNode);
@@ -5212,11 +5212,11 @@ hdd_adapter_t *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
 
 }
 
-hdd_adapter_t *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
 				       uint32_t vdev_id)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS qdf_status;
 
 	qdf_status = hdd_get_front_adapter(hdd_ctx, &adapterNode);
@@ -5248,11 +5248,11 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
  * Return: adapter pointer if found
  *
  */
-hdd_adapter_t *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
 						uint32_t sme_session_id)
 {
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS qdf_status;
 
 
@@ -5274,11 +5274,11 @@ hdd_adapter_t *hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
 	return NULL;
 }
 
-hdd_adapter_t *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
 					     const char *iface_name)
 {
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS qdf_status;
 
 	qdf_status = hdd_get_front_adapter(hdd_ctx, &adapter_node);
@@ -5309,11 +5309,11 @@ hdd_adapter_t *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
  *
  * Return: pointer to adapter or null
  */
-hdd_adapter_t *hdd_get_adapter(struct hdd_context *hdd_ctx,
+struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
 			enum tQDF_ADAPTER_MODE mode)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	QDF_STATUS status;
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapterNode);
@@ -5352,7 +5352,7 @@ uint8_t hdd_get_operating_channel(struct hdd_context *hdd_ctx,
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	uint8_t operatingChannel = 0;
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapterNode);
@@ -5402,7 +5402,7 @@ static inline QDF_STATUS hdd_unregister_wext_all_adapters(struct hdd_context *
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	ENTER();
 
@@ -5432,7 +5432,7 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	ENTER();
 
@@ -5469,7 +5469,7 @@ static QDF_STATUS hdd_abort_sched_scan_all_adapters(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_list_node_t *adapter_node = NULL, *next_node = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	int err;
 
 	ENTER();
@@ -6069,7 +6069,7 @@ static void hdd_skip_acs_scan_timer_handler(void *data)
  *
  * Return: 0 if successful, error number otherwise
  */
-int hdd_wlan_set_ht2040_mode(hdd_adapter_t *adapter, uint16_t staId,
+int hdd_wlan_set_ht2040_mode(struct hdd_adapter *adapter, uint16_t staId,
 			     struct qdf_mac_addr macAddrSTA, int channel_type)
 {
 	int status;
@@ -6503,7 +6503,7 @@ static void hdd_bus_bw_work_handler(struct work_struct *work)
 {
 	struct hdd_context *hdd_ctx = container_of(work, struct hdd_context,
 					bus_bw_work);
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	uint64_t tx_packets = 0, rx_packets = 0;
 	uint64_t fwd_tx_packets = 0, fwd_rx_packets = 0;
 	uint64_t fwd_tx_packets_diff = 0, fwd_rx_packets_diff = 0;
@@ -6796,7 +6796,7 @@ void wlan_hdd_clear_tx_rx_histogram(struct hdd_context *hdd_ctx)
 void wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx)
 {
 
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
 	QDF_STATUS status;
 	int i;
@@ -6879,7 +6879,7 @@ void wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx)
  */
 void wlan_hdd_clear_netif_queue_history(struct hdd_context *hdd_ctx)
 {
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
 	QDF_STATUS status;
 
@@ -7063,7 +7063,7 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level)
  * failure, the channel number returned is zero.
  */
 static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range(
-				hdd_adapter_t *adapter)
+				struct hdd_adapter *adapter)
 {
 	struct sir_pcl_list pcl;
 	QDF_STATUS status;
@@ -7165,7 +7165,7 @@ static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range(
  *
  * Return: None
  */
-void hdd_switch_sap_channel(hdd_adapter_t *adapter, uint8_t channel)
+void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	tHalHandle *hal_handle;
@@ -7203,7 +7203,7 @@ void hdd_switch_sap_channel(hdd_adapter_t *adapter, uint8_t channel)
 		hdd_ap_ctx->sapConfig.ch_width_orig);
 }
 
-int hdd_update_acs_timer_reason(hdd_adapter_t *adapter, uint8_t reason)
+int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
 {
 	struct hdd_external_acs_timer_context *timer_context;
 
@@ -7240,7 +7240,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 {
 	QDF_STATUS status;
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
-	hdd_adapter_t *adapter_temp;
+	struct hdd_adapter *adapter_temp;
 	uint32_t i;
 	bool found = false;
 	uint8_t restart_chan;
@@ -7354,7 +7354,7 @@ static void hdd_init_channel_avoidance(struct hdd_context *hdd_ctx)
 
 }
 
-static void hdd_lte_coex_restart_sap(hdd_adapter_t *adapter,
+static void hdd_lte_coex_restart_sap(struct hdd_adapter *adapter,
 				     struct hdd_context *hdd_ctx)
 {
 	uint8_t restart_chan;
@@ -7444,7 +7444,7 @@ static void hdd_set_thermal_level_cb(void *context, u_int8_t level)
 {
 }
 
-static inline void hdd_lte_coex_restart_sap(hdd_adapter_t *adapter,
+static inline void hdd_lte_coex_restart_sap(struct hdd_adapter *adapter,
 					    struct hdd_context *hdd_ctx)
 {
 	hdd_debug("Channel avoidance is not enabled; Abort SAP restart");
@@ -7465,7 +7465,7 @@ static inline void hdd_lte_coex_restart_sap(hdd_adapter_t *adapter,
 void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind)
 {
 	struct hdd_context *hdd_ctx = NULL;
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	void *cds_context = NULL;
 	int i;
 
@@ -7507,7 +7507,7 @@ void hdd_acs_response_timeout_handler(void *context)
 {
 	struct hdd_external_acs_timer_context *timer_context =
 			(struct hdd_external_acs_timer_context *)context;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	struct hdd_context *hdd_ctx;
 	uint8_t reason;
 
@@ -7941,7 +7941,7 @@ err_out:
  */
 static int hdd_open_p2p_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
 {
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	uint8_t *p2p_dev_addr;
 
 	if (hdd_ctx->config->isP2pDeviceAddrAdministrated &&
@@ -7988,7 +7988,7 @@ static inline int hdd_open_p2p_interface(struct hdd_context *hdd_ctx,
 
 static int hdd_open_ocb_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
 {
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	int ret = 0;
 
 	adapter = hdd_open_adapter(hdd_ctx, QDF_OCB_MODE, "wlanocb%d",
@@ -8010,7 +8010,7 @@ static int hdd_open_ocb_interface(struct hdd_context *hdd_ctx, bool rtnl_held)
  *
  * Return: 0 on success or errno on failure.
  */
-int hdd_start_station_adapter(hdd_adapter_t *adapter)
+int hdd_start_station_adapter(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 
@@ -8040,7 +8040,7 @@ int hdd_start_station_adapter(hdd_adapter_t *adapter)
  *
  * Return: 0 on success errno on failure.
  */
-int hdd_start_ap_adapter(hdd_adapter_t *adapter)
+int hdd_start_ap_adapter(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 
@@ -8070,7 +8070,7 @@ int hdd_start_ap_adapter(hdd_adapter_t *adapter)
  *
  * Return: 0 on success or errno on failure.
  */
-int hdd_start_ftm_adapter(hdd_adapter_t *adapter)
+int hdd_start_ftm_adapter(struct hdd_adapter *adapter)
 {
 	QDF_STATUS qdf_status;
 
@@ -8098,7 +8098,7 @@ int hdd_start_ftm_adapter(hdd_adapter_t *adapter)
  */
 static int hdd_open_interfaces(struct hdd_context *hdd_ctx, bool rtnl_held)
 {
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	int ret;
 
 	if (hdd_ctx->config->dot11p_mode == WLAN_HDD_11P_STANDALONE)
@@ -8960,7 +8960,7 @@ static void wlan_hdd_p2p_lo_event_callback(void *context_ptr,
 	struct hdd_context *hdd_ctx = (struct hdd_context *)context_ptr;
 	struct sir_p2p_lo_event *evt = event_ptr;
 	struct sk_buff *vendor_event;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 
 	ENTER();
 
@@ -9157,7 +9157,7 @@ static QDF_STATUS hdd_set_dbs_scan_and_fw_mode_cfg(struct hdd_context *hdd_ctx)
  *
  * Return: 0 on success and errno on failure.
  */
-static int hdd_features_init(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter)
+static int hdd_features_init(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter)
 {
 	tSirTxPowerLimit hddtxlimit;
 	QDF_STATUS status;
@@ -9315,7 +9315,7 @@ static inline QDF_STATUS hdd_register_bcn_cb(struct hdd_context *hdd_ctx)
  *
  * Return: 0 on success and errno on failure.
  */
-int hdd_configure_cds(struct hdd_context *hdd_ctx, hdd_adapter_t *adapter)
+int hdd_configure_cds(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter)
 {
 	int ret;
 	QDF_STATUS status;
@@ -9599,7 +9599,7 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size)
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
 	QDF_STATUS status;
 	struct hdd_station_ctx *hdd_sta_ctx;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	uint16_t len = 0;
 	char *buf = *buf_ptr;
 
@@ -10060,7 +10060,7 @@ void hdd_deregister_cb(struct hdd_context *hdd_ctx)
  *
  * Return: None
  */
-QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter,
+QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter,
 				 struct tagCsrDelStaParams *pDelStaParams)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
@@ -10091,7 +10091,7 @@ QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter,
  *
  * Return: None
  */
-void hdd_softap_sta_disassoc(hdd_adapter_t *adapter,
+void hdd_softap_sta_disassoc(struct hdd_adapter *adapter,
 			     struct tagCsrDelStaParams *pDelStaParams)
 {
 	ENTER();
@@ -10107,7 +10107,7 @@ void hdd_softap_sta_disassoc(hdd_adapter_t *adapter,
 			     pDelStaParams);
 }
 
-void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *adapter,
+void hdd_softap_tkip_mic_fail_counter_measure(struct hdd_adapter *adapter,
 					      bool enable)
 {
 	ENTER();
@@ -10144,10 +10144,10 @@ QDF_STATUS hdd_issta_p2p_clientconnected(struct hdd_context *hdd_ctx)
  *
  * Return: None
  */
-void wlan_hdd_disable_roaming(hdd_adapter_t *adapter)
+void wlan_hdd_disable_roaming(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	hdd_adapter_t *adapterIdx = NULL;
+	struct hdd_adapter *adapterIdx = NULL;
 	hdd_adapter_list_node_t *adapterNode = NULL;
 	hdd_adapter_list_node_t *pNext = NULL;
 	QDF_STATUS status;
@@ -10196,10 +10196,10 @@ void wlan_hdd_disable_roaming(hdd_adapter_t *adapter)
  *
  * Return: None
  */
-void wlan_hdd_enable_roaming(hdd_adapter_t *adapter)
+void wlan_hdd_enable_roaming(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	hdd_adapter_t *adapterIdx = NULL;
+	struct hdd_adapter *adapterIdx = NULL;
 	hdd_adapter_list_node_t *adapterNode = NULL;
 	hdd_adapter_list_node_t *pNext = NULL;
 	QDF_STATUS status;
@@ -10358,7 +10358,7 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	bool ap_connected = false, sta_connected = false;
 	tHalHandle hal_handle;
 
@@ -10426,11 +10426,11 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 }
 #endif
 
-hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter,
+struct hdd_adapter *hdd_get_con_sap_adapter(struct hdd_adapter *this_sap_adapter,
 							bool check_start_bss)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(this_sap_adapter);
-	hdd_adapter_t *adapter, *con_sap_adapter;
+	struct hdd_adapter *adapter, *con_sap_adapter;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 
@@ -10461,13 +10461,13 @@ hdd_adapter_t *hdd_get_con_sap_adapter(hdd_adapter_t *this_sap_adapter,
 }
 
 #ifdef MSM_PLATFORM
-static inline bool hdd_adapter_is_sta(hdd_adapter_t *adapter)
+static inline bool hdd_adapter_is_sta(struct hdd_adapter *adapter)
 {
 	return adapter->device_mode == QDF_STA_MODE ||
 		adapter->device_mode == QDF_P2P_CLIENT_MODE;
 }
 
-static inline bool hdd_adapter_is_ap(hdd_adapter_t *adapter)
+static inline bool hdd_adapter_is_ap(struct hdd_adapter *adapter)
 {
 	return adapter->device_mode == QDF_SAP_MODE ||
 		adapter->device_mode == QDF_P2P_GO_MODE;
@@ -10480,7 +10480,7 @@ static bool hdd_any_adapter_is_assoc(struct hdd_context *hdd_ctx)
 
 	status = hdd_get_front_adapter(hdd_ctx, &node);
 	while (QDF_IS_STATUS_SUCCESS(status) && node) {
-		hdd_adapter_t *adapter = node->pAdapter;
+		struct hdd_adapter *adapter = node->pAdapter;
 
 		if (adapter &&
 		    hdd_adapter_is_sta(adapter) &&
@@ -10607,8 +10607,8 @@ void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx)
  *
  * Return: QDF_STATUS_SUCCESS or QDF_STATUS_E_FAILURE.
  */
-QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
-						  hdd_adapter_t *ap_adapter,
+QDF_STATUS wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter,
+						  struct hdd_adapter *ap_adapter,
 						  tCsrRoamProfile *roam_profile,
 						  tScanResultHandle *scan_cache,
 						  bool *concurrent_chnl_same)
@@ -10660,7 +10660,7 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
  *
  * Return: None
  */
-void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
+void wlan_hdd_stop_sap(struct hdd_adapter *ap_adapter)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	hdd_hostapd_state_t *hostapd_state;
@@ -10714,7 +10714,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
  *
  * Return: None
  */
-void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter, bool reinit)
+void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	hdd_hostapd_state_t *hostapd_state;
@@ -11452,7 +11452,7 @@ static void hdd_cleanup_present_mode(struct hdd_context *hdd_ctx,
 static int hdd_register_req_mode(struct hdd_context *hdd_ctx,
 				 enum tQDF_GLOBAL_CON_MODE mode)
 {
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	int ret = 0;
 	bool rtnl_held;
 	qdf_device_t qdf_dev = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
@@ -11522,7 +11522,7 @@ static int __con_mode_handler(const char *kmessage, struct kernel_param *kp,
 			      struct hdd_context *hdd_ctx)
 {
 	int ret;
-	hdd_adapter_t *adapter;
+	struct hdd_adapter *adapter;
 	enum tQDF_GLOBAL_CON_MODE curr_mode;
 	enum tQDF_ADAPTER_MODE adapter_mode;
 
@@ -12114,7 +12114,7 @@ void hdd_set_roaming_in_progress(bool value)
  *
  * Return: true if roaming is in progress for STA type, else false
  */
-bool hdd_is_roaming_in_progress(hdd_adapter_t *adapter)
+bool hdd_is_roaming_in_progress(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx;
 	bool ret_status = false;
@@ -12147,7 +12147,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 {
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
 	struct hdd_station_ctx *hdd_sta_ctx = NULL;
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	QDF_STATUS status = 0;
 	uint8_t sta_id = 0;
 	uint8_t *sta_mac = NULL;
@@ -12260,11 +12260,11 @@ end:
 
 /**
  * hdd_restart_sap() - to restart SAP in driver internally
- * @ap_adapter: Pointer to SAP hdd_adapter_t structure
+ * @ap_adapter: Pointer to SAP struct hdd_adapter structure
  *
  * Return: None
  */
-void hdd_restart_sap(hdd_adapter_t *ap_adapter)
+void hdd_restart_sap(struct hdd_adapter *ap_adapter)
 {
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	hdd_hostapd_state_t *hostapd_state;
@@ -12349,7 +12349,7 @@ end:
  */
 void hdd_check_and_restart_sap_with_non_dfs_acs(void)
 {
-	hdd_adapter_t *ap_adapter;
+	struct hdd_adapter *ap_adapter;
 	struct hdd_context *hdd_ctx;
 	cds_context_type *cds_ctx;
 
@@ -12423,7 +12423,7 @@ bool hdd_set_connection_in_progress(bool value)
 	return status;
 }
 
-int wlan_hdd_send_p2p_quota(hdd_adapter_t *adapter, int set_value)
+int wlan_hdd_send_p2p_quota(struct hdd_adapter *adapter, int set_value)
 {
 	if (!adapter) {
 		hdd_err("Invalid adapter");
@@ -12437,7 +12437,7 @@ int wlan_hdd_send_p2p_quota(hdd_adapter_t *adapter, int set_value)
 
 }
 
-int wlan_hdd_send_mcc_latency(hdd_adapter_t *adapter, int set_value)
+int wlan_hdd_send_mcc_latency(struct hdd_adapter *adapter, int set_value)
 {
 	if (!adapter) {
 		hdd_err("Invalid adapter");
@@ -12451,10 +12451,10 @@ int wlan_hdd_send_mcc_latency(hdd_adapter_t *adapter, int set_value)
 	return 0;
 }
 
-hdd_adapter_t *wlan_hdd_get_adapter_from_vdev(struct wlan_objmgr_psoc
+struct hdd_adapter *wlan_hdd_get_adapter_from_vdev(struct wlan_objmgr_psoc
 					      *psoc, uint8_t vdev_id)
 {
-	hdd_adapter_t *adapter = NULL;
+	struct hdd_adapter *adapter = NULL;
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	/*
@@ -12470,7 +12470,7 @@ hdd_adapter_t *wlan_hdd_get_adapter_from_vdev(struct wlan_objmgr_psoc
 	return adapter;
 }
 
-int hdd_get_rssi_snr_by_bssid(hdd_adapter_t *adapter, const uint8_t *bssid,
+int hdd_get_rssi_snr_by_bssid(struct hdd_adapter *adapter, const uint8_t *bssid,
 			      int8_t *rssi, int8_t *snr)
 {
 	QDF_STATUS status;