diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2017-03-25 15:56:25 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-03-31 16:00:25 -0700 |
| commit | 3a67a43b2f32fb1327eee3639a81514f62e6764b (patch) | |
| tree | 676ae598d07687330c3e21178ff783cb92156a2a | |
| parent | 0402b75fe04c3f510f0cf65887dbd88bb53f72c9 (diff) | |
qcacld-3.0: Fix kernel checkpatch warnings in wlan_hdd_tdls.h
Fix kernel checkpatch warnings in wlan_hdd_tdls.h.
Change-Id: Ia294b407926bbcdb712f44f814dbaa7cd1b9f906
CRs-Fixed: 2024274
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 4 | ||||
| -rw-r--r-- | core/hdd/inc/wlan_hdd_tdls.h | 46 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_tdls.c | 22 |
3 files changed, 36 insertions, 36 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 185c30725ee8..335b099ad96d 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1527,8 +1527,8 @@ struct hdd_context_s { qdf_wake_lock_t sap_wake_lock; #ifdef FEATURE_WLAN_TDLS - eTDLSSupportMode tdls_mode; - eTDLSSupportMode tdls_mode_last; + enum tdls_support_mode tdls_mode; + enum tdls_support_mode tdls_mode_last; tdlsConnInfo_t tdlsConnInfo[HDD_MAX_NUM_TDLS_STA]; /* maximum TDLS station number allowed upon runtime condition */ uint16_t max_num_tdls_sta; diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index f3899ccb6d31..41b2566ee326 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -33,7 +33,7 @@ */ /* - * enum eTDLSSupportMode - TDLS support modes + * enum tdls_support_mode - TDLS support modes * @eTDLS_SUPPORT_NOT_ENABLED: TDLS support not enabled * @eTDLS_SUPPORT_DISABLED: suppress implicit trigger and not respond * to the peer @@ -43,13 +43,13 @@ * @eTDLS_SUPPORT_EXTERNAL_CONTROL: implicit trigger but only to a * peer mac configured by user space. */ -typedef enum { +enum tdls_support_mode { eTDLS_SUPPORT_NOT_ENABLED = 0, eTDLS_SUPPORT_DISABLED, eTDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY, eTDLS_SUPPORT_ENABLED, eTDLS_SUPPORT_EXTERNAL_CONTROL, -} eTDLSSupportMode; +}; /** * enum tdls_concerned_external_events - External events that affect TDLS @@ -187,20 +187,20 @@ enum tdls_nss_transition_type { }; /** - * enum tTDLSCapType - tdls capability type + * enum tdls_cap_type - tdls capability type * * @eTDLS_CAP_NOT_SUPPORTED: tdls not supported * @eTDLS_CAP_UNKNOWN: unknown capability * @eTDLS_CAP_SUPPORTED: tdls capability supported */ -typedef enum eTDLSCapType { +enum tdls_cap_type { eTDLS_CAP_NOT_SUPPORTED = -1, eTDLS_CAP_UNKNOWN = 0, eTDLS_CAP_SUPPORTED = 1, -} tTDLSCapType; +}; /** - * enum tTDLSLinkStatus - tdls link status + * enum tdls_link_status - tdls link status * * @eTDLS_LINK_IDLE: tdls link idle * @eTDLS_LINK_DISCOVERING: tdls link discovering @@ -209,14 +209,14 @@ typedef enum eTDLSCapType { * @eTDLS_LINK_CONNECTED: tdls link connected * @eTDLS_LINK_TEARING: tdls link tearing */ -typedef enum eTDLSLinkStatus { +enum tdls_link_status { eTDLS_LINK_IDLE = 0, eTDLS_LINK_DISCOVERING, eTDLS_LINK_DISCOVERED, eTDLS_LINK_CONNECTING, eTDLS_LINK_CONNECTED, eTDLS_LINK_TEARING, -} tTDLSLinkStatus; +}; /** * enum tdls_teardown_reason - Reason for TDLS teardown @@ -243,7 +243,7 @@ enum tdls_teardown_reason { }; /** - * enum tTDLSLinkReason - tdls link reason + * enum tdls_link_reason - tdls link reason * * @eTDLS_LINK_SUCCESS: Success * @eTDLS_LINK_UNSPECIFIED: Unspecified reason @@ -252,14 +252,14 @@ enum tdls_teardown_reason { * @eTDLS_LINK_NOT_BENEFICIAL: Going to AP is better than direct * @eTDLS_LINK_DROPPED_BY_REMOTE: Remote side doesn't want it anymore */ -typedef enum { +enum tdls_link_reason { eTDLS_LINK_SUCCESS, eTDLS_LINK_UNSPECIFIED = -1, eTDLS_LINK_NOT_SUPPORTED = -2, eTDLS_LINK_UNSUPPORTED_BAND = -3, eTDLS_LINK_NOT_BENEFICIAL = -4, eTDLS_LINK_DROPPED_BY_REMOTE = -5 -} tTDLSLinkReason; +}; /** * struct tdls_req_params_t - tdls request parameters @@ -277,7 +277,7 @@ typedef struct { } tdls_req_params_t; /** - * enum tdls_state_t - tdls state + * enum tdls_state - tdls state * * @QCA_WIFI_HAL_TDLS_DISABLED: TDLS is not enabled, or is disabled now * @QCA_WIFI_HAL_TDLS_ENABLED: TDLS is enabled, but not yet tried @@ -286,14 +286,14 @@ typedef struct { * @QCA_WIFI_HAL_TDLS_DROPPED: Direct link was established, but is now dropped * @QCA_WIFI_HAL_TDLS_FAILED: Direct link failed */ -typedef enum { +enum tdls_state { QCA_WIFI_HAL_TDLS_DISABLED = 1, QCA_WIFI_HAL_TDLS_ENABLED, QCA_WIFI_HAL_TDLS_ESTABLISHED, QCA_WIFI_HAL_TDLS_ESTABLISHED_OFF_CHANNEL, QCA_WIFI_HAL_TDLS_DROPPED, QCA_WIFI_HAL_TDLS_FAILED -} tdls_state_t; +}; typedef int (*cfg80211_exttdls_callback)(const uint8_t *mac, uint32_t opclass, @@ -439,8 +439,8 @@ typedef struct _hddTdlsPeer_t { tSirMacAddr peerMac; uint16_t staId; int8_t rssi; - tTDLSCapType tdls_support; - tTDLSLinkStatus link_status; + enum tdls_cap_type tdls_support; + enum tdls_link_status link_status; uint8_t signature; uint8_t is_responder; uint8_t discovery_processed; @@ -462,7 +462,7 @@ typedef struct _hddTdlsPeer_t { qdf_mc_timer_t peer_idle_timer; bool is_peer_idle_timer_initialised; uint8_t spatial_streams; - tTDLSLinkReason reason; + enum tdls_link_reason reason; cfg80211_exttdls_callback state_change_notification; uint8_t qos; } hddTdlsPeer_t; @@ -541,15 +541,15 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const uint8_t *mac); int wlan_hdd_tdls_set_cap(hdd_adapter_t *pAdapter, const uint8_t *mac, - tTDLSCapType cap); + enum tdls_cap_type cap); void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, - tTDLSLinkStatus status, - tTDLSLinkReason reason); + enum tdls_link_status status, + enum tdls_link_reason reason); void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, const uint8_t *mac, - tTDLSLinkStatus linkStatus, - tTDLSLinkReason reason); + enum tdls_link_status linkStatus, + enum tdls_link_reason reason); int wlan_hdd_tdls_recv_discovery_resp(hdd_adapter_t *pAdapter, const uint8_t *mac); diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 9dbdff8a0eeb..c179bb610376 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -1044,7 +1044,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac) * Return: 0 if successful or negative errno otherwise */ int wlan_hdd_tdls_set_cap(hdd_adapter_t *pAdapter, const uint8_t *mac, - tTDLSCapType cap) + enum tdls_cap_type cap) { hddTdlsPeer_t *curr_peer; hdd_context_t *hdd_ctx; @@ -1080,8 +1080,8 @@ ret_status: * Return: Void */ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, - tTDLSLinkStatus status, - tTDLSLinkReason reason) + enum tdls_link_status status, + enum tdls_link_reason reason) { uint32_t state = 0; int32_t res = 0; @@ -1141,8 +1141,8 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer, */ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter, const uint8_t *mac, - tTDLSLinkStatus linkStatus, - tTDLSLinkReason reason) + enum tdls_link_status linkStatus, + enum tdls_link_reason reason) { uint32_t state = 0; int32_t res = 0; @@ -1658,7 +1658,7 @@ static void wlan_hdd_tdls_implicit_enable(tdlsCtx_t *pHddTdlsCtx) * Return: Void */ static void wlan_hdd_tdls_set_mode(hdd_context_t *pHddCtx, - eTDLSSupportMode tdls_mode, + enum tdls_support_mode tdls_mode, bool bUpdateLast, enum tdls_disable_source source) { @@ -1788,7 +1788,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev, hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev); hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter); tdlsCtx_t *pHddTdlsCtx; - eTDLSSupportMode req_tdls_mode; + enum tdls_support_mode req_tdls_mode; tdlsInfo_t *tdlsParams; QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; @@ -3368,7 +3368,7 @@ __wlan_hdd_cfg80211_configure_tdls_mode(struct wiphy *wiphy, hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev); struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_TDLS_CONFIG_MAX + 1]; int ret; - eTDLSSupportMode tdls_mode; + enum tdls_support_mode tdls_mode; uint32_t trigger_mode; tdlsCtx_t *hdd_tdls_ctx; @@ -3808,7 +3808,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy, hdd_context_t *pHddCtx = wiphy_priv(wiphy); QDF_STATUS status; hddTdlsPeer_t *pTdlsPeer; - tTDLSLinkStatus link_status; + enum tdls_link_status link_status; uint16_t numCurrTdlsPeers; unsigned long rc; int ret; @@ -4693,7 +4693,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, tSmeTdlsPeerStateParams smeTdlsPeerStateParams; QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE; hddTdlsPeer_t *pTdlsPeer; - tTDLSLinkStatus peer_status = eTDLS_LINK_IDLE; + enum tdls_link_status peer_status = eTDLS_LINK_IDLE; uint16_t peer_staid; uint8_t peer_offchannelsupp; @@ -6280,7 +6280,7 @@ void wlan_hdd_change_tdls_mode(void *data) void hdd_tdls_notify_p2p_roc(hdd_context_t *hdd_ctx, enum tdls_concerned_external_events event) { - eTDLSSupportMode tdls_mode; + enum tdls_support_mode tdls_mode; qdf_mc_timer_stop(&hdd_ctx->tdls_source_timer); |
