Эх сурвалжийг харах

qcacld-3.0: Increase sae max auth retry count to 3

Increase max sae auth frame retry count to 3 since total SAE auth
timeout is 5s.

Change-Id: I5902cc3411f713eaeed5ef7754fe7fe8e590b459
CRs-Fixed: 2765211
Liangwei Dong 4 жил өмнө
parent
commit
34197fc832

+ 5 - 4
components/mlme/dispatcher/inc/cfg_mlme_generic.h

@@ -723,12 +723,13 @@
  * sae_connect_retries - Bit mask to retry Auth and full connection on assoc
  * sae_connect_retries - Bit mask to retry Auth and full connection on assoc
  * timeout to same AP and auth retries during roaming
  * timeout to same AP and auth retries during roaming
  * @Min: 0x0
  * @Min: 0x0
- * @Max: 0x52
+ * @Max: 0x53
  * @Default: 0x49
  * @Default: 0x49
  *
  *
  * This ini is used to set max auth retry in auth phase of roaming and initial
  * This ini is used to set max auth retry in auth phase of roaming and initial
- * connection and max connection retry in case of assoc timeout. MAX Auth and
- * connection retries are capped to 2 and roam Auth retry is capped to 1.
+ * connection and max connection retry in case of assoc timeout. MAX Auth
+ * retries are capped to 3, connection retries are capped to 2 and roam Auth
+ * retry is capped to 1.
  * Default is 0x49 i.e. 1 retry each.
  * Default is 0x49 i.e. 1 retry each.
  *
  *
  * Bits       Retry Type
  * Bits       Retry Type
@@ -757,7 +758,7 @@
  * </ini>
  * </ini>
  */
  */
 #define CFG_SAE_CONNECION_RETRIES CFG_INI_UINT("sae_connect_retries", \
 #define CFG_SAE_CONNECION_RETRIES CFG_INI_UINT("sae_connect_retries", \
-				0, 0x52, 0x49, CFG_VALUE_OR_DEFAULT, \
+				0, 0x53, 0x49, CFG_VALUE_OR_DEFAULT, \
 				"Bit mask to retry Auth and full connection on assoc timeout to same AP for SAE connection")
 				"Bit mask to retry Auth and full connection on assoc timeout to same AP for SAE connection")
 
 
 /*
 /*

+ 2 - 1
components/mlme/dispatcher/src/wlan_mlme_api.c

@@ -4124,6 +4124,7 @@ wlan_mlme_get_dfs_chan_ageout_time(struct wlan_objmgr_psoc *psoc,
 #define AUTH_INDEX 0
 #define AUTH_INDEX 0
 #define MAX_RETRIES 2
 #define MAX_RETRIES 2
 #define MAX_ROAM_AUTH_RETRIES 1
 #define MAX_ROAM_AUTH_RETRIES 1
+#define MAX_AUTH_RETRIES 3
 
 
 QDF_STATUS
 QDF_STATUS
 wlan_mlme_get_sae_assoc_retry_count(struct wlan_objmgr_psoc *psoc,
 wlan_mlme_get_sae_assoc_retry_count(struct wlan_objmgr_psoc *psoc,
@@ -4164,7 +4165,7 @@ wlan_mlme_get_sae_auth_retry_count(struct wlan_objmgr_psoc *psoc,
 		QDF_GET_BITS(mlme_obj->cfg.gen.sae_connect_retries,
 		QDF_GET_BITS(mlme_obj->cfg.gen.sae_connect_retries,
 			     AUTH_INDEX * NUM_RETRY_BITS, NUM_RETRY_BITS);
 			     AUTH_INDEX * NUM_RETRY_BITS, NUM_RETRY_BITS);
 
 
-	*retry_count = QDF_MIN(MAX_RETRIES, *retry_count);
+	*retry_count = QDF_MIN(MAX_AUTH_RETRIES, *retry_count);
 
 
 	return QDF_STATUS_SUCCESS;
 	return QDF_STATUS_SUCCESS;
 }
 }