qcacld-3.0: Fix compilation error autological-overlap-compare in csr

Fix overlapping true comparison compilation error in CSR.

Change-Id: I42f0a4bd9d0cd431a89aff7f3993917b98e6eeb4
CRs-Fixed: 2849823

core/sme/inc/csr_api.h

@@ -503,14 +503,12 @@ typedef enum {
 typedef enum eCSR_MEDIUM_ACCESS {
 	eCSR_MEDIUM_ACCESS_AUTO = 0,
 	eCSR_MEDIUM_ACCESS_DCF,
-	eCSR_MEDIUM_ACCESS_eDCF,
-	eCSR_MEDIUM_ACCESS_HCF,
+	eCSR_MEDIUM_ACCESS_11e_eDCF,
+	eCSR_MEDIUM_ACCESS_11e_HCF,
 
 	eCSR_MEDIUM_ACCESS_WMM_eDCF_802dot1p,
 	eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP,
 	eCSR_MEDIUM_ACCESS_WMM_eDCF_NoClassify,
-	eCSR_MEDIUM_ACCESS_11e_eDCF = eCSR_MEDIUM_ACCESS_eDCF,
-	eCSR_MEDIUM_ACCESS_11e_HCF = eCSR_MEDIUM_ACCESS_HCF,
 } eCsrMediaAccessType;
 
 typedef enum {

core/sme/src/csr/csr_api_roam.c

@@ -3949,11 +3949,11 @@ QDF_STATUS csr_roam_prepare_bss_config(struct mac_context *mac,
 		pBssConfig->qosType = eCSR_MEDIUM_ACCESS_DCF;
 	}
 
-	if (((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N)
-	    || (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC))
-		&& ((pBssConfig->qosType != eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP)
-		    || (pBssConfig->qosType != eCSR_MEDIUM_ACCESS_11e_HCF)
-		    || (pBssConfig->qosType != eCSR_MEDIUM_ACCESS_11e_eDCF))) {
+	if (((pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11N) ||
+	     (pBssConfig->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11AC)) &&
+	     ((pBssConfig->qosType != eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP) &&
+	      (pBssConfig->qosType != eCSR_MEDIUM_ACCESS_11e_HCF) &&
+	      (pBssConfig->qosType != eCSR_MEDIUM_ACCESS_11e_eDCF))) {
 		/* Joining BSS is 11n capable and WMM is disabled on AP. */
 		/* Assume all HT AP's are QOS AP's and enable WMM */
 		pBssConfig->qosType = eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP;