Merge branch 'backport/backport_some_changes_to_v5.4' into 'release/v5.4'

backport some changes to release/v5.4

See merge request espressif/esp-idf!35283
This commit is contained in:
Jiang Jiang Jian
2024-11-30 01:57:25 +08:00
4 changed files with 5 additions and 5 deletions

View File

@@ -187,7 +187,7 @@ ppRecycleRxPkt = 0x40000e7c;
ppResortTxAMPDU = 0x40000e80;
ppResumeTxAMPDU = 0x40000e84;
ppRxFragmentProc = 0x40000e88;
ppRxPkt = 0x40000e8c;
/*ppRxPkt = 0x40000e8c;*/
ppRxProtoProc = 0x40000e90;
ppSearchTxQueue = 0x40000e94;
ppSearchTxframe = 0x40000e98;

View File

@@ -191,7 +191,7 @@ ppRecycleRxPkt = 0x40000df4;
ppResortTxAMPDU = 0x40000df8;
ppResumeTxAMPDU = 0x40000dfc;
ppRxFragmentProc = 0x40000e00;
ppRxPkt = 0x40000e04;
/*ppRxPkt = 0x40000e04;*/
ppRxProtoProc = 0x40000e08;
ppSearchTxQueue = 0x40000e0c;
ppSearchTxframe = 0x40000e10;

View File

@@ -516,8 +516,8 @@ typedef struct {
uint8_t ssid_hidden; /**< Broadcast SSID or not, default 0, broadcast the SSID */
uint8_t max_connection; /**< Max number of stations allowed to connect in */
uint16_t beacon_interval; /**< Beacon interval which should be multiples of 100. Unit: TU(time unit, 1 TU = 1024 us). Range: 100 ~ 60000. Default value: 100 */
uint8_t csa_count; /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Default value: 3 */
uint8_t dtim_period; /**< Dtim period of soft-AP. Default value: 2 */
uint8_t csa_count; /**< Channel Switch Announcement Count. Notify the station that the channel will switch after the csa_count beacon intervals. Range: 1 ~ 30. Default value: 3 */
uint8_t dtim_period; /**< Dtim period of soft-AP. Range: 1 ~ 10. Default value: 1 */
wifi_cipher_type_t pairwise_cipher; /**< Pairwise cipher of SoftAP, group cipher will be derived using this. Cipher values are valid starting from WIFI_CIPHER_TYPE_TKIP, enum values before that will be considered as invalid and default cipher suites(TKIP+CCMP) will be used. Valid cipher suites in softAP mode are WIFI_CIPHER_TYPE_TKIP, WIFI_CIPHER_TYPE_CCMP and WIFI_CIPHER_TYPE_TKIP_CCMP. */
bool ftm_responder; /**< Enable FTM Responder mode */
wifi_pmf_config_t pmf_cfg; /**< Configuration for Protected Management Frame */