commit ce47879850d7d95c9764929e9fcdd98ec614b914
author Th3 Huang <th3.huang@mediatek.com> Mon Aug 14 18:01:16 2017 +0800
committer TH3 Huang <th3.huang@mediatek.com> Thu Aug 17 13:59:59 2017 +0800
tree 5743114d1428553a494b6d1b4f74e73b9b4329c9
parent 35e0a859db17e841d114ef30b2208c9aff4defe8

[WCNCR00157913] dbdc: BSS shall use WMM0 if DBDC is disable

[Description]
Change WMM index to 0 if DBDC mode is OFF.

Change-Id: Iaf9712ca6b873d3f11dd60d9d7a86868b3fa1255
Signed-off-by: Th3 Huang <th3.huang@mediatek.com>
CR-Id: WCNCR00157913
Feature: dbdc

mgmt/ais_fsm.c

diff --git a/mgmt/ais_fsm.c b/mgmt/ais_fsm.c
index 825133d..6b01e51 100644
--- a/mgmt/ais_fsm.c
+++ b/mgmt/ais_fsm.c
@@ -317,7 +317,8 @@
 	prAisBssInfo->prStaRecOfAP = (P_STA_RECORD_T) NULL;
 	prAisBssInfo->ucNss = wlanGetSupportNss(prAdapter, prAisBssInfo->ucBssIndex);
 	prAisBssInfo->eDBDCBand = ENUM_BAND_0;
-	prAisBssInfo->ucWmmQueSet = DBDC_2G_WMM_INDEX;
+	prAisBssInfo->ucWmmQueSet =
+			(prAdapter->rWifiVar.ucDbdcMode == DBDC_MODE_DISABLED) ? DBDC_5G_WMM_INDEX : DBDC_2G_WMM_INDEX;
 
 	/* 4 <4> Allocate MSDU_INFO_T for Beacon */
 	prAisBssInfo->prBeacon = cnmMgtPktAlloc(prAdapter,

mgmt/cnm.c

diff --git a/mgmt/cnm.c b/mgmt/cnm.c
index 76cfbf6..7e2e8e0 100644
--- a/mgmt/cnm.c
+++ b/mgmt/cnm.c
@@ -1250,7 +1250,8 @@
 	if (eRfBand == BAND_5G)
 		prDbdcCap->ucWmmSetIndex = DBDC_5G_WMM_INDEX;
 	else
-		prDbdcCap->ucWmmSetIndex = DBDC_2G_WMM_INDEX;
+		prDbdcCap->ucWmmSetIndex =
+			(prAdapter->rWifiVar.ucDbdcMode == DBDC_MODE_DISABLED) ? DBDC_5G_WMM_INDEX : DBDC_2G_WMM_INDEX;
 
 	/* Nss & band 0/1 */
 	switch (prAdapter->rWifiVar.ucDbdcMode) {

mgmt/p2p_dev_fsm.c

diff --git a/mgmt/p2p_dev_fsm.c b/mgmt/p2p_dev_fsm.c
index 0e8c855..6e38d9d 100644
--- a/mgmt/p2p_dev_fsm.c
+++ b/mgmt/p2p_dev_fsm.c
@@ -102,7 +102,9 @@
 
 			prP2pBssInfo->eBand = BAND_2G4;
 			prP2pBssInfo->eDBDCBand = ENUM_BAND_0;
-			prP2pBssInfo->ucWmmQueSet = DBDC_2G_WMM_INDEX;
+			prP2pBssInfo->ucWmmQueSet =
+				(prAdapter->rWifiVar.ucDbdcMode == DBDC_MODE_DISABLED) ?
+				DBDC_5G_WMM_INDEX : DBDC_2G_WMM_INDEX;
 
 			prP2pBssInfo->ucPhyTypeSet = prAdapter->rWifiVar.ucAvailablePhyTypeSet & PHY_TYPE_SET_802_11GN;
 

mgmt/p2p_role_fsm.c

diff --git a/mgmt/p2p_role_fsm.c b/mgmt/p2p_role_fsm.c
index 72bd3d3..b0fed3c 100644
--- a/mgmt/p2p_role_fsm.c
+++ b/mgmt/p2p_role_fsm.c
@@ -177,7 +177,8 @@
 		prP2pBssInfo->eBssSCO = CHNL_EXT_SCN;
 		prP2pBssInfo->ucNss = wlanGetSupportNss(prAdapter, prP2pBssInfo->ucBssIndex);
 		prP2pBssInfo->eDBDCBand = ENUM_BAND_0;
-		prP2pBssInfo->ucWmmQueSet = DBDC_2G_WMM_INDEX;
+		prP2pBssInfo->ucWmmQueSet =
+			(prAdapter->rWifiVar.ucDbdcMode == DBDC_MODE_DISABLED) ? DBDC_5G_WMM_INDEX : DBDC_2G_WMM_INDEX;
 
 		if (IS_FEATURE_ENABLED(prAdapter->rWifiVar.ucQoS))
 			prP2pBssInfo->fgIsQBSS = TRUE;