qcacld-3.0: Rename pcl types to avoid multiple handling for SCC/MCC

PCL for next connection is same in case of existing
concuurency is 3 port with 2 connections (one sta & sap)on
5G MCC or SCC and another STA on 2G. similarly pcl will
be same for 2 connections (one sta & sap)on
2.4G MCC or SCC and another STA on 5G.So, PM_STA_SAP_SCC_5_STA_24_DBS
can be renamed to PM_STA_SAP_24_STA_5_DBS and PM_STA_SAP_SCC_24_STA_5_DBS
to PM_STA_SAP_24_STA_5_DBS to avoid separate handling for SCC/MCC.

Change-Id: I5eeb809d49586b936f214c87defe6c0790d9829c
CRs-Fixed: 3170092

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -841,9 +841,9 @@ enum policy_mgr_two_connection_mode {
  * SAP on 5 G
  * @PM_STA_SAP_SCC_5_SAP_24_DBS: STA & SAP connection on 5 Ghz SCC, another
  * SAP on 2.4 G
- * @PM_STA_SAP_SCC_24_STA_5_DBS: STA & SAP connection on 2.4 Ghz SCC, another
+ * @PM_STA_SAP_24_STA_5_DBS: STA & SAP connection on 2.4 Ghz SCC/MCC, another
  * STA on 5G
- * @PM_STA_SAP_SCC_5_STA_24_DBS: STA & SAP connection on 5 Ghz SCC, another
+ * @PM_STA_SAP_5_STA_24_DBS: STA & SAP connection on 5 Ghz SCC/MCC, another
  * STA on 2.4 G
  * @PM_NAN_DISC_SAP_SCC_24_NDI_5_DBS: NAN_DISC & SAP connection on 2.4 Ghz SCC,
  * NDI/NDP on 5 G
@@ -885,8 +885,8 @@ enum policy_mgr_two_connection_mode {
 enum policy_mgr_three_connection_mode {
 	PM_STA_SAP_SCC_24_SAP_5_DBS,
 	PM_STA_SAP_SCC_5_SAP_24_DBS,
-	PM_STA_SAP_SCC_24_STA_5_DBS,
-	PM_STA_SAP_SCC_5_STA_24_DBS,
+	PM_STA_SAP_24_STA_5_DBS,
+	PM_STA_SAP_5_STA_24_DBS,
 	PM_NAN_DISC_SAP_SCC_24_NDI_5_DBS,
 	PM_NAN_DISC_NDI_SCC_24_SAP_5_DBS,
 	PM_SAP_NDI_SCC_5_NAN_DISC_24_DBS,

components/cmn_services/policy_mgr/src/wlan_policy_mgr_pcl.c

@@ -2122,28 +2122,28 @@ enum policy_mgr_three_connection_mode
 			pm_conc_connection_list[list_sap[0]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[1]].freq)) {
-			index = PM_STA_SAP_SCC_24_STA_5_DBS;
+			index = PM_STA_SAP_24_STA_5_DBS;
 		} else if (WLAN_REG_IS_24GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[1]].freq) &&
 		     WLAN_REG_IS_24GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sap[0]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[0]].freq)) {
-			index = PM_STA_SAP_SCC_24_STA_5_DBS;
+			index = PM_STA_SAP_24_STA_5_DBS;
 		} else if (WLAN_REG_IS_24GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[0]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sap[0]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[1]].freq)) {
-			index = PM_STA_SAP_SCC_5_STA_24_DBS;
+			index = PM_STA_SAP_5_STA_24_DBS;
 		} else if (WLAN_REG_IS_24GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[1]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sap[0]].freq) &&
 		     WLAN_REG_IS_5GHZ_CH_FREQ(
 			pm_conc_connection_list[list_sta[0]].freq)) {
-			index = PM_STA_SAP_SCC_5_STA_24_DBS;
+			index = PM_STA_SAP_5_STA_24_DBS;
 		} else {
 			index =  PM_MAX_THREE_CONNECTION_MODE;
 		}

components/cmn_services/policy_mgr/src/wlan_policy_mgr_tables_2x2_dbs_i.h

@@ -1919,10 +1919,11 @@ fourth_connection_pcl_dbs_table
 	[PM_STA_MODE] = { PM_5G, PM_5G, PM_5G } },
 	[PM_STA_SAP_SCC_5_SAP_24_DBS] = {
 	[PM_STA_MODE] = { PM_24G, PM_24G, PM_24G } },
-	[PM_STA_SAP_SCC_24_STA_5_DBS] = {
-	[PM_SAP_MODE] = { PM_5G, PM_5G, PM_5G } },
-	[PM_STA_SAP_SCC_5_STA_24_DBS] = {
-	[PM_SAP_MODE] = { PM_24G, PM_24G, PM_24G } },
+	[PM_STA_SAP_24_STA_5_DBS] = {
+	[PM_SAP_MODE] = { PM_SCC_ON_5_CH_5G, PM_SCC_ON_5_CH_5G,
+			 PM_SCC_ON_5_CH_5G} },
+	[PM_STA_SAP_5_STA_24_DBS] = {
+	[PM_SAP_MODE] = { PM_SBS_CH_2G, PM_SBS_CH_2G, PM_SBS_CH_2G } },
 	[PM_NAN_DISC_SAP_SCC_24_NDI_5_DBS] = {
 	[PM_SAP_MODE] = { PM_5G, PM_5G, PM_5G } },
 	[PM_NAN_DISC_NDI_SCC_24_SAP_5_DBS] = {
@@ -1990,7 +1991,12 @@ fourth_connection_pcl_dbs_table
 	[PM_NAN_DISC_24_STA_24_STA_5_SMM] = {
 	[PM_NDI_MODE] = { PM_5G, PM_5G, PM_5G } },
 	[PM_NAN_DISC_24_STA_24_STA_5_DBS] = {
-	[PM_NDI_MODE] = { PM_5G, PM_5G, PM_5G } }
+	[PM_NDI_MODE] = { PM_5G, PM_5G, PM_5G } },
+	[PM_STA_SAP_24_STA_5_DBS] = {
+	[PM_SAP_MODE] = { PM_SCC_ON_5_CH_5G, PM_SCC_ON_5_CH_5G,
+			 PM_SCC_ON_5_CH_5G} },
+	[PM_STA_SAP_5_STA_24_DBS] = {
+	[PM_SAP_MODE] = { PM_SBS_CH_2G, PM_SBS_CH_2G, PM_SBS_CH_2G } }
 };
 #endif
 #endif