commit ff831e146b8d0f9ce12d96cf11df044ef0b7c5dd
author Litien Chang <litien.chang@mediatek.com> Fri Apr 21 19:31:15 2017 +0800
committer Litien Chang <litien.chang@mediatek.com> Mon Apr 24 12:00:33 2017 +0800
tree b343190b0b05c80233a9da892358d7bf4c11dd8b
parent 9bcb403584076ba0732eef7c7c8373962f746b2a

[WCNCR00152564] softap: apply cfg80211 setting for P2PGO

[Description]
Change P2PGO bandwidth, secondary channel offset,
channel center frequency segment 0/1
config from cfg80211
refer commit 60c48051cf8e ("[WCNCR00145892] softap:
add BW/SCO/S0/S1 config from cfg80211")

Unit Test:
1. Test p2p GO/softap  successful link and ping
with BW/SCO/S0/S1 setting from wifi.cfg and cfg80211.

Change-Id: Ib58232c34d97100194703520cec2360e32f50358
Feature:softap
Signed-off-by: Litien Chang <litien.chang@mediatek.com>
CR-Id: WCNCR00152564

mgmt/cnm.c

diff --git a/mgmt/cnm.c b/mgmt/cnm.c
index 59931ab..6ebb334 100644
--- a/mgmt/cnm.c
+++ b/mgmt/cnm.c
@@ -926,14 +926,14 @@
 		if (ucMaxBandwidth > prAdapter->rWifiVar.ucStaBandwidth)
 			ucMaxBandwidth = prAdapter->rWifiVar.ucStaBandwidth;
 	} else if (IS_BSS_P2P(prBssInfo)) {
-		/* AP mode */
-		if (p2pFuncIsAPMode(prAdapter->rWifiVar.prP2PConnSettings[prBssInfo->u4PrivateData])) {
-
-			prP2pRoleFsmInfo = p2pFuncGetRoleByBssIdx(prAdapter, ucBssIndex);
-			if (!prAdapter->rWifiVar.ucApChnlDefFromCfg && prP2pRoleFsmInfo) {
-				prP2pConnReqInfo = &(prP2pRoleFsmInfo->rConnReqInfo);
-				ucMaxBandwidth = prP2pConnReqInfo->eChnlBw;
-			} else {
+		prP2pRoleFsmInfo = p2pFuncGetRoleByBssIdx(prAdapter, ucBssIndex);
+		if (!prAdapter->rWifiVar.ucApChnlDefFromCfg && prP2pRoleFsmInfo
+			&& prBssInfo->eCurrentOPMode == OP_MODE_ACCESS_POINT) {
+			prP2pConnReqInfo = &(prP2pRoleFsmInfo->rConnReqInfo);
+			ucMaxBandwidth = prP2pConnReqInfo->eChnlBw;
+		} else {
+			/* AP mode */
+			if (p2pFuncIsAPMode(prAdapter->rWifiVar.prP2PConnSettings[prBssInfo->u4PrivateData])) {
 				if (prBssInfo->eBand == BAND_2G4)
 					ucMaxBandwidth = prAdapter->rWifiVar.ucAp2gBandwidth;
 				else
@@ -942,14 +942,16 @@
 				if (ucMaxBandwidth > prAdapter->rWifiVar.ucApBandwidth)
 					ucMaxBandwidth = prAdapter->rWifiVar.ucApBandwidth;
 			}
+			/* P2P mode */
+			else {
+				if (prBssInfo->eBand == BAND_2G4)
+					ucMaxBandwidth = prAdapter->rWifiVar.ucP2p2gBandwidth;
+				else
+					ucMaxBandwidth = prAdapter->rWifiVar.ucP2p5gBandwidth;
+			}
+
 		}
-		/* P2P mode */
-		else {
-			if (prBssInfo->eBand == BAND_2G4)
-				ucMaxBandwidth = prAdapter->rWifiVar.ucP2p2gBandwidth;
-			else
-				ucMaxBandwidth = prAdapter->rWifiVar.ucP2p5gBandwidth;
-		}
+
 	}
 
 	return ucMaxBandwidth;

mgmt/p2p_role_fsm.c

diff --git a/mgmt/p2p_role_fsm.c b/mgmt/p2p_role_fsm.c
index 3f25764..a7b96dd 100644
--- a/mgmt/p2p_role_fsm.c
+++ b/mgmt/p2p_role_fsm.c
@@ -866,7 +866,8 @@
 			prP2pConnReqInfo->eConnRequest = P2P_CONNECTION_TYPE_PURE_AP;
 
 			/* Overwrite AP channel */
-			if (prAdapter->rWifiVar.ucApChannel) {
+			if (prAdapter->rWifiVar.ucApChannel &&
+				prAdapter->rWifiVar.ucApChnlDefFromCfg) {
 				prP2pConnReqInfo->rChannelInfo.ucChannelNum = prAdapter->rWifiVar.ucApChannel;
 
 				if (prAdapter->rWifiVar.ucApChannel <= 14)

os/linux/gl_p2p_cfg80211.c

diff --git a/os/linux/gl_p2p_cfg80211.c b/os/linux/gl_p2p_cfg80211.c
index 3f5ffaf..d3a82b3 100644
--- a/os/linux/gl_p2p_cfg80211.c
+++ b/os/linux/gl_p2p_cfg80211.c
@@ -1208,6 +1208,7 @@
 				prWifiVar = &prAdapter->rWifiVar;
 
 				if ((prWifiVar->ucApChannel != 0) &&
+					(prWifiVar->ucApChnlDefFromCfg != 0) &&
 					(prWifiVar->ucApChannel != rRfChnlInfo.ucChannelNum)) {
 					rRfChnlInfo.ucChannelNum = prWifiVar->ucApChannel;
 					rRfChnlInfo.eBand =