Merge branch 'mesh/cs_root_conflict' into 'master'

detect and fix root conflicts when router BSSID is not set

See merge request idf/esp-idf!3869

components/esp32/include/esp_mesh.h

@@ -1044,9 +1044,10 @@ esp_err_t esp_mesh_set_vote_percentage(float percentage);
 float esp_mesh_get_vote_percentage(void);
 
 /**
- * @brief      Set mesh softAP associate expired time
+ * @brief      Set mesh softAP associate expired time (default:10 seconds)
  *             - If mesh softAP hasn't received any data from an associated child within this time,
  *             mesh softAP will take this child inactive and disassociate it.
+ *             - If mesh softAP is encrypted, this value should be set a greater value, such as 30 seconds.
  *
  * @param[in]  seconds  the expired time
  *
@@ -1227,7 +1228,7 @@ esp_err_t esp_mesh_get_group_list(mesh_addr_t *addr, int num);
 bool esp_mesh_is_my_group(const mesh_addr_t *addr);
 
 /**
- * @brief      Set mesh network capacity
+ * @brief      Set mesh network capacity (max:1000, default:300)
  *
  * @attention  This API shall be called before mesh is started.
  *

components/esp32/lib

@@ -1 +1 @@
-Subproject commit 4123071ff5e730cfed699f853a81359008607314
+Subproject commit 630ff8281b5babb5ba67dffdc6139bdbc4c58f92

components/esp32/wifi_init.c

@@ -34,6 +34,7 @@ static void __attribute__((constructor)) s_set_default_wifi_log_level()
        the user to set the level again before esp_wifi_init() is called.
     */
     esp_log_level_set("wifi", CONFIG_LOG_DEFAULT_LEVEL);
+    esp_log_level_set("mesh", CONFIG_LOG_DEFAULT_LEVEL);
 }
 
 static void esp_wifi_set_debug_log()

components/idf_test/integration_test/TC_IT_WIFI_CONN.yml

@@ -789,25 +789,20 @@ test cases:
     - - R SSC1 C +JAP:CONNECTED
   - - SSC SSC1 sta -D
     - - R SSC1 RE JAP:DISCONNECTED,\d+,8
-  - - SSC SSC1 sta -C -s <ap_ssid> -p <random_string>
-    - - R SSC1 RE JAP:DISCONNECTED,\d+,15
   - - SSC SSC1 sta -C -s <random_string> -p <ap_password>
     - - R SSC1 RE JAP:DISCONNECTED,\d+,201
   execution time: 0.0
   expected result: |-
     1. disconnect event reason REASON_ASSOC_LEAVE
-    2. disconnect event reason REASON_4WAY_HANDSHAKE_TIMEOUT
-    3. disconnect event reason REASON_NO_AP_FOUND
+    2. disconnect event reason REASON_NO_AP_FOUND
   initial condition: STAM1
   level: Integration
   module: WIFI MAC
   steps: |-
     1. sta connect to AP, and disconnect
-    2. connect to AP with wrong password
-    3. connect to AP not exist
+    2. connect to AP not exist
   sub module: WIFI Connect
-  summary: test wifi disconnect reason REASON_ASSOC_LEAVE, REASON_4WAY_HANDSHAKE_TIMEOUT,
-    REASON_NO_AP_FOUND
+  summary: test wifi disconnect reason REASON_ASSOC_LEAVE, REASON_NO_AP_FOUND
   test environment: SSC_T1_1
   test point 1: basic function
   test point 2: wifi disconnect reason test
@@ -886,7 +881,7 @@ test cases:
   - - SSC SSC1 ap -S -s <random_string> -p <random_string> -t 3 -m 1
     - - R SSC1 C +SAP:OK
   - - SSC SSC2 sta -C -s <random_string> -p 1234567890
-    - - R SSC2 RE JAP:DISCONNECTED,\d+,204
+    - - R SSC2 RE JAP:DISCONNECTED,\d+,15
   - - SSC SSC2 sta -D
     - - R SSC2 C +QAP:OK
   - - WIFI <pc_wifi_nic> CONN <random_string> <random_string> <pc_ip_wifi>
@@ -896,7 +891,7 @@ test cases:
   execution time: 0.0
   expected result: |-
     1. succeed
-    2. disconnect event REASON_HANDSHAKE_TIMEOUT
+    2. disconnect event REASON_4WAY_HANDSHAKE_TIMEOUT
     3. succeed
     4. succeed
     5. disconnect event REASON_ASSOC_TOOMANY
@@ -910,7 +905,7 @@ test cases:
     4. PC WIFI NIC connect to target1
     5. target2 connect to target1 with correct password
   sub module: WIFI Connect
-  summary: test wifi disconnect reason REASON_ASSOC_TOOMANY, REASON_HANDSHAKE_TIMEOUT
+  summary: test wifi disconnect reason REASON_ASSOC_TOOMANY, REASON_4WAY_HANDSHAKE_TIMEOUT
   test environment: SSC_T2_2
   test point 1: basic function
   test point 2: wifi disconnect reason test

examples/mesh/internal_communication/main/Kconfig.projbuild

@@ -59,7 +59,7 @@ config MESH_AP_CONNECTIONS
 
 config MESH_MAX_LAYER
     int "Mesh Max Layer"
-        range 1 15
+        range 1 25
         default 6
         help
             Max layer allowed in mesh network.