espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix(wifi): fix some wifi bugs 240715(Backport v5.2)

See merge request espressif/esp-idf!32138
This commit is contained in:
Jiang Jiang Jian
2024-07-16 12:49:54 +08:00
parent ae9f7f32ae b338abce37
commit 07dad8169e
8 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@@ -1591,7 +1591,7 @@ trc_SetTxAmpduState = 0x40001ccc;
trc_tid_isTxAmpduOperational = 0x40001cd0; trc_tid_isTxAmpduOperational = 0x40001cd0;
trcAmpduSetState = 0x40001cd4; trcAmpduSetState = 0x40001cd4;
wDevCheckBlockError = 0x40001cd8; wDevCheckBlockError = 0x40001cd8;
wDev_AppendRxBlocks = 0x40001cdc; /*wDev_AppendRxBlocks = 0x40001cdc;*/
wDev_DiscardFrame = 0x40001ce0; wDev_DiscardFrame = 0x40001ce0;
wDev_GetNoiseFloor = 0x40001ce4; wDev_GetNoiseFloor = 0x40001ce4;
wDev_IndicateAmpdu = 0x40001ce8; wDev_IndicateAmpdu = 0x40001ce8;

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@@ -1623,7 +1623,7 @@ TRC_PER_IS_GOOD = 0x400017a4;
trc_SetTxAmpduState = 0x400017a8; trc_SetTxAmpduState = 0x400017a8;
trc_tid_isTxAmpduOperational = 0x400017ac; trc_tid_isTxAmpduOperational = 0x400017ac;
trcAmpduSetState = 0x400017b0; trcAmpduSetState = 0x400017b0;
wDev_AppendRxBlocks = 0x400017b8; /*wDev_AppendRxBlocks = 0x400017b8;*/
wDev_DiscardFrame = 0x400017bc; wDev_DiscardFrame = 0x400017bc;
wDev_GetNoiseFloor = 0x400017c0; wDev_GetNoiseFloor = 0x400017c0;
wDev_IndicateAmpdu = 0x400017c4; wDev_IndicateAmpdu = 0x400017c4;

2
components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
View File

@@ -145,7 +145,7 @@ trc_SetTxAmpduState = 0x40000dc4;
trc_tid_isTxAmpduOperational = 0x40000dc8; trc_tid_isTxAmpduOperational = 0x40000dc8;
trcAmpduSetState = 0x40000dcc; trcAmpduSetState = 0x40000dcc;
//wDevCheckBlockError = 0x40000dd0; //wDevCheckBlockError = 0x40000dd0;
wDev_AppendRxBlocks = 0x40000dd4; /*wDev_AppendRxBlocks = 0x40000dd4;*/
wDev_DiscardFrame = 0x40000dd8; wDev_DiscardFrame = 0x40000dd8;
wDev_GetNoiseFloor = 0x40000ddc; wDev_GetNoiseFloor = 0x40000ddc;
wDev_IndicateAmpdu = 0x40000de0; wDev_IndicateAmpdu = 0x40000de0;

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@@ -1927,7 +1927,7 @@ trc_SetTxAmpduState = 0x40005838;
trc_tid_isTxAmpduOperational = 0x40005844; trc_tid_isTxAmpduOperational = 0x40005844;
trcAmpduSetState = 0x40005850; trcAmpduSetState = 0x40005850;
wDevCheckBlockError = 0x4000585c; wDevCheckBlockError = 0x4000585c;
wDev_AppendRxBlocks = 0x40005868; /*wDev_AppendRxBlocks = 0x40005868;*/
wDev_DiscardFrame = 0x40005874; wDev_DiscardFrame = 0x40005874;
wDev_GetNoiseFloor = 0x40005880; wDev_GetNoiseFloor = 0x40005880;
wDev_IndicateAmpdu = 0x4000588c; wDev_IndicateAmpdu = 0x4000588c;

2
components/esp_wifi/Kconfig
View File

@@ -385,7 +385,7 @@ menu "Wi-Fi"
config ESP_WIFI_GMAC_SUPPORT config ESP_WIFI_GMAC_SUPPORT
bool "WiFi GMAC Support(GMAC128 and GMAC256)" bool "WiFi GMAC Support(GMAC128 and GMAC256)"
default n default y
help help
Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification. Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification.

18
components/esp_wifi/include/esp_wifi.h
View File

@@ -238,16 +238,32 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
#define WIFI_FTM_RESPONDER 0 #define WIFI_FTM_RESPONDER 0
#endif #endif
#if CONFIG_ESP_WIFI_GCMP_SUPPORT
#define WIFI_ENABLE_GCMP (1<<4)
#else
#define WIFI_ENABLE_GCMP 0
#endif
#if CONFIG_ESP_WIFI_GMAC_SUPPORT
#define WIFI_ENABLE_GMAC (1<<5)
#else
#define WIFI_ENABLE_GMAC 0
#endif
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0) #define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1) #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2) #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
#define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3) #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
#define CONFIG_FEATURE_GCMP_BIT (1<<4)
#define CONFIG_FEATURE_GMAC_BIT (1<<5)
/* Set additional WiFi features and capabilities */ /* Set additional WiFi features and capabilities */
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \ #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
WIFI_ENABLE_SPIRAM | \ WIFI_ENABLE_SPIRAM | \
WIFI_FTM_INITIATOR | \ WIFI_FTM_INITIATOR | \
WIFI_FTM_RESPONDER) WIFI_FTM_RESPONDER | \
WIFI_ENABLE_GCMP | \
WIFI_ENABLE_GMAC)
#define WIFI_INIT_CONFIG_DEFAULT() { \ #define WIFI_INIT_CONFIG_DEFAULT() { \
.osi_funcs = &g_wifi_osi_funcs, \ .osi_funcs = &g_wifi_osi_funcs, \

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 2ba34ebd54...768a789155

2
components/wpa_supplicant/src/crypto/crypto_ops.c
View File

@@ -43,7 +43,7 @@ static int esp_aes_gmac(const u8 *key, size_t key_len, const u8 *iv, size_t iv_l
#if CONFIG_GMAC #if CONFIG_GMAC
return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag); return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag);
#else #else
return 0; return -1;
#endif #endif
} }