From 41a6496ffe26ba7fb955793098fc107618a6f9dc Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 14 Aug 2017 15:29:42 -0700 Subject: [PATCH] qcacld-3.0: Replace typedef roaming_info_t 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 roaming_info_t typedef does not meet any of those criteria, so replace it with a well named struct. In the process remove the unused roamingEvent that it contains. Change-Id: I0bf974fcbe0a591973610eef27acc3da07071a57 CRs-Fixed: 2092842 --- core/hdd/inc/wlan_hdd_main.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 24c8a73cc01e..e63f9dd6ff16 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -432,17 +432,25 @@ enum hdd_roam_state { HDD_ROAM_STATE_SETTING_KEY, }; -typedef struct roaming_info_s { +/** + * struct hdd_roaming_info - HDD Internal Roaming Information + * @roamingState: Current state of roaming + * @bssid: BSSID to which we are connected + * @peerMac: Peer MAC address for IBSS connection + * @roamId: Unique identifier for a roaming instance + * @roamStatus: Current roam command status + * @deferKeyComplete: Should key complete be deferred? + * + */ +struct hdd_roaming_info { enum hdd_roam_state roamingState; - qdf_event_t roamingEvent; - tSirMacAddr bssid; tSirMacAddr peerMac; uint32_t roamId; eRoamCmdStatus roamStatus; bool deferKeyComplete; -} roaming_info_t; +}; #ifdef FEATURE_WLAN_WAPI /* Define WAPI macros for Length, BKID count etc*/ @@ -672,7 +680,7 @@ struct hdd_station_ctx { /* Connection information*/ struct hdd_connection_info conn_info; - roaming_info_t roam_info; + struct hdd_roaming_info roam_info; int ft_carrier_on;