Merge branch 'bugfix/nan_crash_sched_bcn_v5.1' into 'release/v5.1'

Fix crash while stopping NAN (Backport v5.1) See merge request espressif/esp-idf!28181
espressif · Jan 3, 2024 · 453738c · 453738c
2 parents 0aed680 + 6bc256a
commit 453738c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/esp_wifi/wifi_apps/include/esp_nan.h b/components/esp_wifi/wifi_apps/include/esp_nan.h
@@ -26,8 +26,8 @@ extern "C" {
 #define NDP_STATUS_REJECTED     2
 
 #define NAN_MAX_PEERS_RECORD    15
-#define ESP_NAN_PUBLISH         1
-#define ESP_NAN_SUBSCRIBE       2
+#define ESP_NAN_PUBLISH         2
+#define ESP_NAN_SUBSCRIBE       1
 
 /** Parameters of a peer service record */
 struct nan_peer_record {
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a