Browse Source

qcacld-3.0: Disable AP+AP+STA SCC/MCC on same mac

3 connection SCC/MCC on same mac is not prefer, if allow STA connect to
different channel of AP+AP SCC channel on same mac, there is no
implementation to restart SAP on new channels to avoid MCC.

Based on change Id2e9ad7d17bab6ea0aff6913b25f0eb330dc6c13,
fix is to change third connection dbs pcl table, only allow STA connect
on different band. For SBS capable chip, STA connect on same mac is
allowed, so don't change sbs pcl table.

Change-Id: I0229ae710b793e8ecd2240c37d7ca00d7694bb44
CRs-Fixed: 3039787
Will Huang 3 years ago
parent
commit
83e382dc2f

+ 4 - 6
components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h

@@ -361,7 +361,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
 	[PM_NDI_MODE] = {PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE} },
 
 	[PM_SAP_SAP_SCC_24_1x1] = {
-	[PM_STA_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},
+	[PM_STA_MODE] = {PM_5G, PM_5G, PM_5G},
 	[PM_SAP_MODE] = {PM_5G, PM_5G, PM_5G},
 	[PM_P2P_CLIENT_MODE] = {
 		PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},
@@ -371,7 +371,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
 	[PM_NDI_MODE] = {PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE} },
 
 	[PM_SAP_SAP_SCC_24_2x2] = {
-	[PM_STA_MODE] = {PM_5G_SCC_CH, PM_5G_SCC_CH, PM_5G_SCC_CH},
+	[PM_STA_MODE] = {PM_5G, PM_5G, PM_5G},
 	[PM_SAP_MODE] = {PM_5G, PM_5G, PM_5G},
 	[PM_P2P_CLIENT_MODE] = {
 		PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},
@@ -403,8 +403,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
 	[PM_NDI_MODE] = {PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE} },
 
 	[PM_SAP_SAP_SCC_5_1x1] = {
-	[PM_STA_MODE] = {PM_24G_SCC_CH_SBS_CH_5G, PM_24G_SCC_CH,
-		PM_24G_SCC_CH_SBS_CH},
+	[PM_STA_MODE] = {PM_24G, PM_24G, PM_24G},
 	[PM_SAP_MODE] = {PM_24G, PM_24G, PM_24G},
 	[PM_P2P_CLIENT_MODE] = {
 		PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},
@@ -413,8 +412,7 @@ pm_third_connection_pcl_dbs_2x2_table = {
 	[PM_NDI_MODE] = {PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE} },
 
 	[PM_SAP_SAP_SCC_5_2x2] = {
-	[PM_STA_MODE] = {PM_24G_SCC_CH_SBS_CH_5G, PM_24G_SCC_CH,
-		PM_24G_SCC_CH_SBS_CH},
+	[PM_STA_MODE] = {PM_24G, PM_24G, PM_24G},
 	[PM_SAP_MODE] = {PM_24G, PM_24G, PM_24G},
 	[PM_P2P_CLIENT_MODE] = {
 		PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE, PM_MAX_PCL_TYPE},