Merge branch 'bugfix/fix_fragment_bug_v5.2' into 'release/v5.2'

fix(wifi): fix fragment bug and esp32c6 issues (v5.2) See merge request espressif/esp-idf!26955
espressif · Nov 7, 2023 · 42db3c8 · 42db3c8
2 parents a2b9004 + 0204515
commit 42db3c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/components/esp_wifi/include/esp_now.h b/components/esp_wifi/include/esp_now.h
@@ -97,6 +97,7 @@ typedef struct esp_now_rate_config {
     wifi_phy_mode_t phymode;                 /**< ESPNOW phymode of specified interface */
     wifi_phy_rate_t rate;                    /**< ESPNOW rate of specified interface*/
     bool ersu;                               /**< ESPNOW using ersu send frame*/
+    bool dcm;                                /**< ESPNOW using dcm rate to send frame*/
 } esp_now_rate_config_t;
 
 /**

diff --git a/components/esp_wifi/include/esp_wifi_he_types.h b/components/esp_wifi/include/esp_wifi_he_types.h
@@ -157,7 +157,7 @@ typedef struct {
     unsigned : 15;                                /**< reserved */
     unsigned : 15;                                /**< reserved */
     unsigned : 2;                                 /**< reserved */
-    unsigned noise_floor : 8;                     /**< the noise floor of the reception frame */
+    signed noise_floor : 8;                       /**< the noise floor of the reception frame */
     unsigned channel : 4;                         /**< the primary channel */
     unsigned second : 4;                          /**< the second channel if in HT40 */
     unsigned : 8;                                 /**< reserved */

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		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