Browse Source

qcacld-3.0: Add aliasing for INI names

Currently driver has only one name for an INI, with
this change add second name as well for few INIs based on
new requirement.

Change-Id: I6eee13935d1c5c74794027b88d94cbb572339e9e
CRs-Fixed: 3007209
Ashish Kumar Dhanotiya 3 years ago
parent
commit
d89f39b0bd

+ 38 - 31
components/mlme/dispatcher/inc/cfg_mlme_lfr.h

@@ -1375,7 +1375,7 @@
 
 /*
  * <ini>
- * gRoamRestTimeMin - Set min neighbor scan timer period
+ * gRoamRestTimeMin/RoamScan_HomeTime - Set min neighbor scan timer period
  * @Min: 3
  * @Max: 300
  * @Default: 50
@@ -1394,7 +1394,7 @@
  * </ini>
  */
 #define CFG_LFR_NEIGHBOR_SCAN_MIN_TIMER_PERIOD CFG_INI_UINT( \
-	"gRoamRestTimeMin", \
+	"gRoamRestTimeMin RoamScan_HomeTime", \
 	3, \
 	300, \
 	50, \
@@ -1403,7 +1403,8 @@
 
 /*
  * <ini>
- * gNeighborLookupThreshold - Set neighbor lookup rssi threshold
+ * gNeighborLookupThreshold - Set neighbor lookup rssi
+ * threshold
  * @Min: 10
  * @Max: 120
  * @Default: 78
@@ -1459,7 +1460,8 @@
 
 /*
  * <ini>
- * gRoamRescanRssiDiff - Sets RSSI for Scan trigger in firmware
+ * gRoamRescanRssiDiff/RoamScan_StepRSSI - Sets RSSI for Scan trigger in
+ * firmware
  * @Min: 0
  * @Max: 100
  * @Default: 5
@@ -1477,7 +1479,7 @@
  * </ini>
  */
 #define CFG_LFR_ROAM_RESCAN_RSSI_DIFF CFG_INI_UINT( \
-	"gRoamRescanRssiDiff", \
+	"gRoamRescanRssiDiff RoamScan_StepRSSI", \
 	0, \
 	100, \
 	5, \
@@ -1512,7 +1514,8 @@
 
 /*
  * <ini>
- * gNeighborScanChannelMaxTime - Set neighbor scan channel max time
+ * gNeighborScanChannelMaxTime/RoamScan_ActiveCH_DwellTime - Set neighbor scan
+ * channel max time
  * @Min: 3
  * @Max: 300
  * @Default: 40
@@ -1529,7 +1532,7 @@
  * </ini>
  */
 #define CFG_LFR_NEIGHBOR_SCAN_MAX_CHAN_TIME CFG_INI_UINT( \
-	"gNeighborScanChannelMaxTime", \
+	"gNeighborScanChannelMaxTime RoamScan_ActiveCH_DwellTime", \
 	3, \
 	300, \
 	40, \
@@ -1865,7 +1868,7 @@
 
 /*
  * <ini>
- * gRoamScanHomeAwayTime - Sets the Home Away Time to firmware
+ * gRoamScanHomeAwayTime/RoamScan_AwayTime - Sets the Home Away Time to firmware
  * @Min: 0
  * @Max: 300
  * @Default: 0
@@ -1883,7 +1886,7 @@
  * </ini>
  */
 #define CFG_LFR_ROAM_SCAN_HOME_AWAY_TIME CFG_INI_UINT( \
-	"gRoamScanHomeAwayTime", \
+	"gRoamScanHomeAwayTime RoamScan_AwayTime", \
 	0, \
 	300, \
 	0, \
@@ -1938,7 +1941,8 @@
 
 /*
  * <ini>
- * bss_load_threshold - bss load above which the STA should trigger roaming
+ * bss_load_threshold/RoamCU_Trigger - bss load above which the STA should
+ * trigger roaming
  * @Min: 0
  * @Max: 100
  * @Default: 70
@@ -1955,7 +1959,7 @@
  * </ini>
  */
 #define CFG_BSS_LOAD_THRESHOLD CFG_INI_UINT( \
-		"bss_load_threshold", \
+		"bss_load_threshold RoamCU_Trigger", \
 		0, \
 		100, \
 		70, \
@@ -1988,7 +1992,8 @@
 
 /*
  * <ini>
- * bss_load_trigger_5g_rssi_threshold - Current AP minimum RSSI in dBm below
+ * bss_load_trigger_5g_rssi_threshold/RoamCU_5GRSSIRange -
+ * Current AP minimum RSSI in dBm below
  * which roaming can be triggered if BSS load exceeds bss_load_threshold.
  * @Min: -120
  * @Max: 0
@@ -2007,7 +2012,7 @@
  * </ini>
  */
 #define CFG_BSS_LOAD_TRIG_5G_RSSI_THRES CFG_INI_INT( \
-	"bss_load_trigger_5g_rssi_threshold", \
+	"bss_load_trigger_5g_rssi_threshold RoamCU_5GRSSIRange", \
 	-120, \
 	0, \
 	-70, \
@@ -2016,7 +2021,8 @@
 
 /*
  * <ini>
- * bss_load_trigger_2g_rssi_threshold - Current AP minimum RSSI in dBm below
+ * bss_load_trigger_2g_rssi_threshold/RoamCU_24GRSSIRange -
+ * Current AP minimum RSSI in dBm below
  * which roaming can be triggered if BSS load exceeds bss_load_threshold.
  * @Min: -120
  * @Max: 0
@@ -2035,7 +2041,7 @@
  * </ini>
  */
 #define CFG_BSS_LOAD_TRIG_2G_RSSI_THRES CFG_INI_INT( \
-	"bss_load_trigger_2g_rssi_threshold", \
+	"bss_load_trigger_2g_rssi_threshold RoamCU_24GRSSIRange", \
 	-120, \
 	0, \
 	-60, \
@@ -2291,11 +2297,12 @@
 
 /*
  * <ini>
- * idle_roam_rssi_delta - This threshold is the criteria to decide whether DUT
- * is idle or moving. If rssi delta is more than configured thresold then its
- * considered as not idle. RSSI delta is entered in dBm. Idle roaming can be
- * triggered if the connected AP rssi change exceeds or falls below the
- * rssi delta and if other criteria of ini "enable_idle_roam" is met
+ * idle_roam_rssi_delta/RoamIdle_RSSIVariation - This threshold is the criteria
+ * to decide whether DUT is idle or moving. If rssi delta is more than
+ * configured threshold then its considered as not idle. RSSI delta is entered
+ *in dBm. Idle roaming can be triggered if the connected AP rssi change exceeds
+ * or falls below the rssi delta and if other criteria of ini "enable_idle_roam"
+ * is met
  * @Min: 0
  * @Max: 50
  * @Default: 3
@@ -2309,7 +2316,7 @@
  * </ini>
  */
 #define CFG_LFR_IDLE_ROAM_RSSI_DELTA CFG_INI_UINT( \
-	"idle_roam_rssi_delta", \
+	"idle_roam_rssi_delta RoamIdle_RSSIVariation", \
 	0, \
 	50, \
 	3, \
@@ -2346,8 +2353,8 @@
 
 /*
  * <ini>
- * idle_data_packet_count - No of tx/rx packets above which the connection is
- * not idle.
+ * idle_data_packet_count/RoamIdle_InactivePacketCount - No of tx/rx packets
+ * above which the connection is not idle.
  * @Min: 0
  * @Max: 0xFFFFFFFF
  * @Default: 10
@@ -2366,7 +2373,7 @@
  * </ini>
  */
 #define CFG_LFR_IDLE_ROAM_PACKET_COUNT CFG_INI_UINT( \
-	"idle_data_packet_count", \
+	"idle_data_packet_count RoamIdle_InactivePacketCount", \
 	0, \
 	0xFFFFFFFF, \
 	10, \
@@ -2375,9 +2382,9 @@
 
 /*
  * <ini>
- * idle_roam_min_rssi - Minimum RSSI of connected AP, below which
- * idle roam scan can be triggered if other criteria of ini "enable_idle_roam"
- * is met.
+ * idle_roam_min_rssi/RoamIdle_MinRSSI - Minimum RSSI of connected AP, below
+ * which idle roam scan can be triggered if other criteria of ini
+ * "enable_idle_roam" is met.
  * @Min: -96
  * @Max: 0
  * @Default: -65
@@ -2391,7 +2398,7 @@
  * </ini>
  */
 #define CFG_LFR_IDLE_ROAM_MIN_RSSI CFG_INI_INT( \
-	"idle_roam_min_rssi", \
+	"idle_roam_min_rssi RoamIdle_MinRSSI", \
 	-96, \
 	0, \
 	-65, \
@@ -2765,8 +2772,8 @@
 
 /*
  * <ini>
- * roam_inactive_data_count - Maximum allowed data packets count during
- * roam_scan_inactivity_time.
+ * roam_inactive_data_count/RoamScan_InactiveCount - Maximum allowed data
+ * packets count during roam_scan_inactivity_time.
  *
  * @Min: 0
  * @Max: 0xFFFFFFFF
@@ -2785,7 +2792,7 @@
  * </ini>
  */
 #define CFG_ROAM_INACTIVE_COUNT CFG_INI_UINT( \
-	"roam_inactive_data_count", \
+	"roam_inactive_data_count RoamScan_InactiveCount", \
 	0, \
 	0xFFFFFFFF, \
 	10, \

+ 14 - 13
components/mlme/dispatcher/inc/cfg_mlme_roam_scoring.h

@@ -69,7 +69,7 @@
 
 /*
  * <ini>
- * roam_score_delta - Percentage increment in roam score value
+ * roam_score_delta/RoamCommon_Delta - Percentage increment in roam score value
  * that is expected from a roaming candidate AP.
  * @Min: 0
  * @Max: 100
@@ -88,7 +88,7 @@
  * </ini>
  */
 #define CFG_ROAM_SCORE_DELTA CFG_INI_UINT( \
-			"roam_score_delta", \
+			"roam_score_delta RoamCommon_Delta", \
 			0, \
 			100, \
 			0, \
@@ -173,8 +173,8 @@
 
 /*
  * <ini>
- * candidate_min_rssi_for_disconnect - Candidate AP minimum RSSI in
- * idle roam trigger(in dBm).
+ * candidate_min_rssi_for_disconnect/RoamEmergency_TargetMinRSSI -
+ * Candidate AP minimum RSSI in idle roam trigger(in dBm).
  * @Min: -120
  * @Max: 0
  * @Default: -75
@@ -193,7 +193,7 @@
  * </ini>
  */
 #define CFG_DISCONNECT_ROAM_TRIGGER_MIN_RSSI CFG_INI_INT( \
-		"candidate_min_rssi_for_disconnect", \
+		"candidate_min_rssi_for_disconnect RoamEmergency_TargetMinRSSI", \
 		-120, \
 		0, \
 		-75, \
@@ -202,8 +202,8 @@
 
 /*
  * <ini>
- * candidate_min_rssi_for_beacon_miss - Candidate AP minimum RSSI for beacon
- * miss roam trigger (in dBm)
+ * candidate_min_rssi_for_beacon_miss/RoamBeaconLoss_TargetMinRSSI -
+ * Candidate AP minimum RSSI for beacon miss roam trigger (in dBm)
  * @Min: -120
  * @Max: 0
  * @Default: -75
@@ -222,7 +222,7 @@
  * </ini>
  */
 #define CFG_BMISS_ROAM_MIN_RSSI CFG_INI_INT( \
-	"candidate_min_rssi_for_beacon_miss", \
+	"candidate_min_rssi_for_beacon_miss RoamBeaconLoss_TargetMinRSSI", \
 	-120, \
 	0, \
 	-75, \
@@ -258,7 +258,8 @@
 
 /*
  * <ini>
- * idle_roam_score_delta - Roam score delta value in percentage for idle roam.
+ * idle_roam_score_delta/RoamIdle_Delta - Roam score delta value in
+ * percentage for idle roam.
  * @Min: 0
  * @Max: 100
  * @Default: 0
@@ -277,7 +278,7 @@
  * </ini>
  */
 #define CFG_IDLE_ROAM_SCORE_DELTA CFG_INI_UINT( \
-		"idle_roam_score_delta", \
+		"idle_roam_score_delta RoamIdle_Delta", \
 		0, \
 		100, \
 		0, \
@@ -286,8 +287,8 @@
 
 /*
  * <ini>
- * btm_roam_score_delta - Roam score delta value in percentage for BTM triggered
- * roaming.
+ * btm_roam_score_delta/RoamBTM_Delta - Roam score delta value in percentage for
+ * BTM triggered roaming.
  * @Min: 0
  * @Max: 100
  * @Default: 0
@@ -307,7 +308,7 @@
  * </ini>
  */
 #define CFG_BTM_ROAM_SCORE_DELTA CFG_INI_UINT( \
-	"btm_roam_score_delta", \
+	"btm_roam_score_delta RoamBTM_Delta", \
 	0, \
 	100, \
 	0, \

+ 2 - 2
components/mlme/dispatcher/inc/cfg_mlme_sta.h

@@ -25,7 +25,7 @@
 
 /*
  * <ini>
- * gStaKeepAlivePeriod - STA keep alive period
+ * gStaKeepAlivePeriod/ConKeepAlive_Interval - STA keep alive period
  *
  *
  * @Min: 0
@@ -44,7 +44,7 @@
  * </ini>
  */
 #define CFG_INFRA_STA_KEEP_ALIVE_PERIOD CFG_INI_UINT( \
-	"gStaKeepAlivePeriod", \
+	"gStaKeepAlivePeriod ConKeepAlive_Interval", \
 	0, \
 	1000, \
 	30, \

+ 3 - 2
components/pmo/dispatcher/inc/wlan_pmo_common_cfg.h

@@ -157,7 +157,8 @@
 
 /*
  * <ini>
- * gEnableModulatedDTIM - Enable/Disable modulated DTIM feature
+ * gEnableModulatedDTIM/ConDTIMSkipping_Number - Enable/Disable modulated DTIM
+ * feature
  * @Min: 0
  * @Max: 10
  * @Default: 0
@@ -179,7 +180,7 @@
  * </ini>
  */
 #define CFG_PMO_ENABLE_MODULATED_DTIM CFG_INI_UINT( \
-	"gEnableModulatedDTIM", \
+	"gEnableModulatedDTIM ConDTIMSkipping_Number", \
 	0, \
 	10, \
 	0, \