commit ad42b9a5a74347749d71e8a44f15049382e0a935
author Th3 Huang <th3.huang@mediatek.com> Wed Dec 07 17:59:39 2016 +0800
committer Th3 Huang <th3.huang@mediatek.com> Wed Dec 07 18:03:48 2016 +0800
tree 46f993d10b58d4dd2baefc6df06a15080ea99309
parent 33367a9bf035a0dc48db51d6f93bec63d0b3ac04

[WCNCR00008172] connect : Revise Bandwidth for Channel req before ASSOC.

[Description]
Fix
Revise Bandwidth for Channel req before ASSOC.

Change-Id: If6c915dcd0506149fcaeb60bba4c7c00a7aeafc1
Feature: connect/bandwidth
Signed-off-by: Th3 Huang <th3.huang@mediatek.com>
CR-Id: WCNCR00008172

include/mgmt/rlm.h

diff --git a/include/mgmt/rlm.h b/include/mgmt/rlm.h
index 0bd1d12..3a374c1 100644
--- a/include/mgmt/rlm.h
+++ b/include/mgmt/rlm.h
@@ -371,6 +371,13 @@
 
 VOID rlmModifyVhtBwPara(PUINT_8 pucVhtChannelFrequencyS1, PUINT_8 pucVhtChannelFrequencyS2, PUINT_8 pucVhtChannelWidth);
 
+VOID rlmReviseMaxBw(
+	P_ADAPTER_T prAdapter,
+	UINT_8 ucBssIndex,
+	P_ENUM_CHNL_EXT_T peExtend,
+	P_ENUM_CHANNEL_WIDTH_P peChannelWidth,
+	PUINT_8 pucS1,
+	PUINT_8 pucPrimaryCh);
 
 /*******************************************************************************
 *                              F U N C T I O N S

mgmt/ais_fsm.c

diff --git a/mgmt/ais_fsm.c b/mgmt/ais_fsm.c
index f21c58e..cc3a805 100644
--- a/mgmt/ais_fsm.c
+++ b/mgmt/ais_fsm.c
@@ -1291,6 +1291,10 @@
 			prMsgChReq->ucRfCenterFreqSeg1 = prAisFsmInfo->prTargetBssDesc->ucCenterFreqS1;
 			prMsgChReq->ucRfCenterFreqSeg2 = prAisFsmInfo->prTargetBssDesc->ucCenterFreqS2;
 
+			rlmReviseMaxBw(prAdapter, prAisBssInfo->ucBssIndex, &prMsgChReq->eRfSco,
+					(P_ENUM_CHANNEL_WIDTH_P)&prMsgChReq->eRfChannelWidth,
+				&prMsgChReq->ucRfCenterFreqSeg1, &prMsgChReq->ucPrimaryChannel);
+
 			mboxSendMsg(prAdapter, MBOX_ID_0, (P_MSG_HDR_T) prMsgChReq, MSG_SEND_METHOD_BUF);
 
 			prAisFsmInfo->fgIsChannelRequested = TRUE;

mgmt/p2p_role_fsm.c

diff --git a/mgmt/p2p_role_fsm.c b/mgmt/p2p_role_fsm.c
index 639bc0c..4317332 100644
--- a/mgmt/p2p_role_fsm.c
+++ b/mgmt/p2p_role_fsm.c
@@ -1153,6 +1153,11 @@
 			prChnlReqInfo->eChannelWidth = prJoinInfo->prTargetBssDesc->eChannelWidth;
 			prChnlReqInfo->ucCenterFreqS1 = prJoinInfo->prTargetBssDesc->ucCenterFreqS1;
 			prChnlReqInfo->ucCenterFreqS2 = prJoinInfo->prTargetBssDesc->ucCenterFreqS2;
+
+			rlmReviseMaxBw(prAdapter, prP2pBssInfo->ucBssIndex, &prChnlReqInfo->eChnlSco,
+					(P_ENUM_CHANNEL_WIDTH_P)&prChnlReqInfo->eChannelWidth,
+				&prChnlReqInfo->ucCenterFreqS1, &prChnlReqInfo->ucReqChnlNum);
+
 #if CFG_SUPPORT_DBDC
 			cnmDbdcEnableDecision(prAdapter, prP2pBssInfo->ucBssIndex, prChnlReqInfo->eBand);
 			cnmGetDbdcCapability(prAdapter,

mgmt/rlm.c

diff --git a/mgmt/rlm.c b/mgmt/rlm.c
index b71eb5e..626d5b5 100644
--- a/mgmt/rlm.c
+++ b/mgmt/rlm.c
@@ -1568,7 +1568,7 @@
 	}
 }
 
-static VOID rlmReviseMaxBw(
+VOID rlmReviseMaxBw(
 	P_ADAPTER_T prAdapter,
 	UINT_8 ucBssIndex,
 	P_ENUM_CHNL_EXT_T peExtend,