qcacld-3.0: Fix implicit conversion error for sme_QosWmmDirType

Replace sme_tspec_dir_type and sme_QosWmmDirType with sme_qos_wmm_dir_type
to avoid implicit conversion warnings/errors and to conform with linux coding
guidelines.

Change-Id: I1567ebbe7ec8adab3344d96f0d2aa93367975926
CRs-Fixed: 2071677

core/hdd/inc/wlan_hdd_cfg.h

@@ -11153,28 +11153,28 @@ struct hdd_config {
 	bool bImplicitQosEnabled;
 
 	/* default TSPEC parameters for AC_VO */
-	sme_QosWmmDirType InfraDirAcVo;
+	sme_qos_wmm_dir_type InfraDirAcVo;
 	uint16_t InfraNomMsduSizeAcVo;
 	uint32_t InfraMeanDataRateAcVo;
 	uint32_t InfraMinPhyRateAcVo;
 	uint16_t InfraSbaAcVo;
 
 	/* default TSPEC parameters for AC_VI */
-	sme_QosWmmDirType InfraDirAcVi;
+	sme_qos_wmm_dir_type InfraDirAcVi;
 	uint16_t InfraNomMsduSizeAcVi;
 	uint32_t InfraMeanDataRateAcVi;
 	uint32_t InfraMinPhyRateAcVi;
 	uint16_t InfraSbaAcVi;
 
 	/* default TSPEC parameters for AC_BE */
-	sme_QosWmmDirType InfraDirAcBe;
+	sme_qos_wmm_dir_type InfraDirAcBe;
 	uint16_t InfraNomMsduSizeAcBe;
 	uint32_t InfraMeanDataRateAcBe;
 	uint32_t InfraMinPhyRateAcBe;
 	uint16_t InfraSbaAcBe;
 
 	/* default TSPEC parameters for AC_BK */
-	sme_QosWmmDirType InfraDirAcBk;
+	sme_qos_wmm_dir_type InfraDirAcBk;
 	uint16_t InfraNomMsduSizeAcBk;
 	uint32_t InfraMeanDataRateAcBk;
 	uint32_t InfraMinPhyRateAcBk;

core/hdd/inc/wlan_hdd_wmm.h

@@ -162,7 +162,7 @@ struct hdd_wmm_ac_status {
 	bool wmmAcIsUapsdEnabled;
 	uint32_t wmmAcUapsdServiceInterval;
 	uint32_t wmmAcUapsdSuspensionInterval;
-	sme_QosWmmDirType wmmAcUapsdDirection;
+	sme_qos_wmm_dir_type wmmAcUapsdDirection;
 
 #ifdef FEATURE_WLAN_ESE
 	uint32_t wmmInactivityTime;

core/hdd/src/wlan_hdd_tdls.c

@@ -5142,7 +5142,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 						 (WLAN_HDD_GET_CTX(pAdapter))->pcds_context,
 						 peer_staid, ucAc[ac],
 						 tlTid[ac], tlTid[ac], 0, 0,
-						 SME_BI_DIR, 1,
+						 SME_QOS_WMM_TS_DIR_BOTH, 1,
 						 pAdapter->sessionId,
 						 pHddCtx->config->DelayedTriggerFrmInt);
 				}

core/hdd/src/wlan_hdd_wmm.c

@@ -145,7 +145,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 	QDF_STATUS status;
 	uint32_t service_interval;
 	uint32_t suspension_interval;
-	sme_QosWmmDirType direction;
+	sme_qos_wmm_dir_type direction;
 	bool psb;
 
 	/* The TSPEC must be valid */
@@ -1840,7 +1840,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   SME_AC_VO, 7, 7,
 						   pHddCtx->config->InfraUapsdVoSrvIntv,
 						   pHddCtx->config->InfraUapsdVoSuspIntv,
-						   SME_BI_DIR, 1,
+						   SME_QOS_WMM_TS_DIR_BOTH, 1,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
@@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   SME_AC_VI, 5, 5,
 						   pHddCtx->config->InfraUapsdViSrvIntv,
 						   pHddCtx->config->InfraUapsdViSuspIntv,
-						   SME_BI_DIR, 1,
+						   SME_QOS_WMM_TS_DIR_BOTH, 1,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
@@ -1872,7 +1872,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   SME_AC_BK, 2, 2,
 						   pHddCtx->config->InfraUapsdBkSrvIntv,
 						   pHddCtx->config->InfraUapsdBkSuspIntv,
-						   SME_BI_DIR, 1,
+						   SME_QOS_WMM_TS_DIR_BOTH, 1,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
@@ -1888,7 +1888,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   SME_AC_BE, 3, 3,
 						   pHddCtx->config->InfraUapsdBeSrvIntv,
 						   pHddCtx->config->InfraUapsdBeSuspIntv,
-						   SME_BI_DIR, 1,
+						   SME_QOS_WMM_TS_DIR_BOTH, 1,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 

core/sme/inc/sme_api.h

@@ -194,15 +194,18 @@ typedef enum {
 	SME_AC_VO = 3
 } sme_ac_enum_type;
 
-/* TSPEC Direction Enum Type */
+/*---------------------------------------------------------------------------
+  Enumeration of the various TSPEC directions
+
+  From 802.11e/WMM specifications
+  ---------------------------------------------------------------------------*/
+
 typedef enum {
-	/* uplink */
-	SME_TX_DIR = 0,
-	/* downlink */
-	SME_RX_DIR = 1,
-	/* bidirectional */
-	SME_BI_DIR = 2,
-} sme_tspec_dir_type;
+	SME_QOS_WMM_TS_DIR_UPLINK = 0,
+	SME_QOS_WMM_TS_DIR_DOWNLINK = 1,
+	SME_QOS_WMM_TS_DIR_RESV = 2,    /* Reserved */
+	SME_QOS_WMM_TS_DIR_BOTH = 3,
+} sme_qos_wmm_dir_type;
 
 /**
  * struct sme_oem_capability - OEM capability to be exchanged between host
@@ -997,7 +1000,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 				      sme_ac_enum_type ac, uint8_t tid,
 				      uint8_t pri, uint32_t srvc_int,
 				      uint32_t sus_int,
-				      sme_tspec_dir_type dir,
+				      sme_qos_wmm_dir_type dir,
 				      uint8_t psb, uint32_t sessionId,
 				      uint32_t delay_interval);
 

core/sme/inc/sme_qos_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -165,19 +165,6 @@ typedef enum {
 	SME_QOS_WMM_UP_MAX
 } sme_QosWmmUpType;
 
-/*---------------------------------------------------------------------------
-  Enumeration of the various TSPEC directions
-
-  From 802.11e/WMM specifications
-  ---------------------------------------------------------------------------*/
-
-typedef enum {
-	SME_QOS_WMM_TS_DIR_UPLINK = 0,
-	SME_QOS_WMM_TS_DIR_DOWNLINK = 1,
-	SME_QOS_WMM_TS_DIR_RESV = 2,    /* Reserved */
-	SME_QOS_WMM_TS_DIR_BOTH = 3,
-} sme_QosWmmDirType;
-
 /*---------------------------------------------------------------------------
   Enumeration of the various TSPEC ack policies.
 
@@ -202,7 +189,7 @@ typedef struct {
 	sme_QosWmmAckPolicyType ack_policy;
 	sme_QosWmmUpType up;    /* User priority */
 	uint8_t psb;            /* power-save bit */
-	sme_QosWmmDirType direction;    /* Direction */
+	sme_qos_wmm_dir_type direction;    /* Direction */
 	uint8_t tid;            /* TID : To be filled up by SME-QoS */
 } sme_QosWmmTsInfoType;
 

core/sme/src/common/sme_api.c

@@ -14029,7 +14029,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 				   sme_ac_enum_type ac, uint8_t tid,
 				   uint8_t pri, uint32_t srvc_int,
 				   uint32_t sus_int,
-				   sme_tspec_dir_type dir,
+				   sme_qos_wmm_dir_type dir,
 				   uint8_t psb, uint32_t sessionId,
 				   uint32_t delay_interval)
 {

core/sme/src/qos/sme_qos.c

@@ -342,7 +342,7 @@ typedef struct sme_QosSearchInfo_s {
 	uint8_t sessionId;
 	uint8_t index;
 	sme_QosSearchKey key;
-	sme_QosWmmDirType direction;
+	sme_qos_wmm_dir_type direction;
 	uint8_t tspec_mask;
 } sme_QosSearchInfo;
 /*---------------------------------------------------------------------------
@@ -3418,7 +3418,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
  * Return: None
  */
 static void sme_qos_fill_aggr_info(int ac_id, int ts_id,
-				   sme_QosWmmDirType direction,
+				   sme_qos_wmm_dir_type direction,
 				   tSirAggrQosReq *msg,
 				   sme_QosSessionInfo *session)
 {
@@ -3755,7 +3755,7 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx,
 	sme_QosACInfo *ac_info;
 	uint8_t tspec_flow_idx;
 	bool found = false;
-	sme_QosWmmDirType direction, qos_dir;
+	sme_qos_wmm_dir_type direction, qos_dir;
 	uint8_t ac1;
 	tDot11fIERICDataDesc *ric_data = NULL;
 	uint32_t ric_len;