Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ftm_calib_v6.1' into 'release/v6.1'

Browse Source 
fix(ftm): tolerate small t2/t3 inversion in measurement validation (Backport v6.1)

See merge request espressif/esp-idf!52071
This commit is contained in:
Jiang Jiang Jian
2026-09-02 17:23:25 +08:00
parent bd51ab4afb b95ad5669f
commit 1c03ef78f3
9 changed files with 150 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -663,7 +663,7 @@ rcReachRetryLimit = 0x40001d9c;
lmacProcessShortRetryFail = 0x40001da0;
lmacEndRetryAMPDUFail = 0x40001da4;
ppFillAMPDUBar = 0x40001da8;
rcGetRate = 0x40001dac;
//rcGetRate = 0x40001dac;
ppReSendBar = 0x40001db0;
lmacProcessLongRetryFail = 0x40001db4;
lmacRetryTxFrame = 0x40001db8;
@@ -715,7 +715,7 @@ hal_crypto_enable = 0x40001e68;
wDev_Insert_KeyEntry = 0x40001e70;
wDev_remove_KeyEntry = 0x40001e74;
rc_enable_trc = 0x40001e78;
rc_set_per_conn_fix_rate = 0x40001e7c;
//rc_set_per_conn_fix_rate = 0x40001e7c;
wdev_csi_rx_process = 0x40001e80;
wDev_SnifferRxAmpdu = 0x40001e84;
hal_mac_tsf_reset = 0x40001e88;

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

@@ -242,7 +242,7 @@ rcUpSched = 0x40000f60;
rcReachRetryLimit = 0x40000f64;
rcGetDCMMaxRate = 0x40000f68;
rcGetSMPDURate = 0x40000f6c;
rcGetRate = 0x40000f70;
//rcGetRate = 0x40000f70;
rx11AXRate2AMPDULimit = 0x40000f74;
rx11NRate2AMPDULimit = 0x40000f78;
rssi_margin = 0x40000f7c;

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

@@ -241,7 +241,7 @@ rcUpSched = 0x40000ed4;
rcReachRetryLimit = 0x40000ed8;
rcGetDCMMaxRate = 0x40000edc;
rcGetSMPDURate = 0x40000ee0;
rcGetRate = 0x40000ee4;
//rcGetRate = 0x40000ee4;
rx11AXRate2AMPDULimit = 0x40000ee8;
rx11NRate2AMPDULimit = 0x40000eec;
rssi_margin = 0x40000ef0;

6
components/esp_rom/esp32s31/ld/esp32s31.rom.pp.ld
View File

@@ -239,7 +239,7 @@ rcUpSched = 0x2f801074;
rcReachRetryLimit = 0x2f801078;
rcGetDCMMaxRate = 0x2f80107c;
rcGetSMPDURate = 0x2f801080;
rcGetRate = 0x2f801084;
//rcGetRate = 0x2f801084;
rx11AXRate2AMPDULimit = 0x2f801088;
rx11NRate2AMPDULimit = 0x2f80108c;
rssi_margin = 0x2f801090;
@@ -267,11 +267,11 @@ wdev_mac_special_reg_store = 0x2f8010e4;
wdev_mac_wakeup = 0x2f8010e8;
wdev_mac_sleep = 0x2f8010ec;
wDev_ProcessFiq = 0x2f8010f0;
wDev_ProcessRxSucData = 0x2f8010f4;
//wDev_ProcessRxSucData = 0x2f8010f4;
wdevProcessRxSucDataAll = 0x2f8010f8;
wdev_csi_len_align = 0x2f8010fc;
wDev_IndicateBeaconMemoryFrame = 0x2f801100;
wDev_ProcessBeaconMemoryRxSuc = 0x2f801104;
//wDev_ProcessBeaconMemoryRxSuc = 0x2f801104;
wdevProcessModemStateRxBeacon = 0x2f801108;
wdev_is_data_in_rxlist = 0x2f80110c;
wdev_process_tbtt = 0x2f801110;

206
components/esp_wifi/include/esp_private/ftm_calibration_data.h
View File

@@ -43,35 +43,35 @@
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 41 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32C3
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 451 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 449 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 448 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 454 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 455 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 450 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 452 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 439 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 441 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 441 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 431 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 433 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 433 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 260 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 267 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 267 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 268 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 270 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 270 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 252 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 259 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 247 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 250 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 260 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 260 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 255 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 253 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 443 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 439 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 440 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 440 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 437 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 437 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 438 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 438 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 82 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 86 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 86 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 80 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 81 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 83 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 83 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32C2
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 443 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
@@ -136,97 +136,97 @@
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 82 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32C6
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 704 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 711 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 707 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 716 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 716 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 717 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 717 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 714 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 706 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 712 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 703 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 703 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 702 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 702 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 601 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 610 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 605 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 616 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 617 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 617 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 617 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 617 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 609 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 614 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 608 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 611 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 611 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 611 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 609 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 609 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 786 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 786 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 791 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 794 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 790 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 790 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 796 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 796 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 436 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 436 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 436 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 433 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 433 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32C61
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 854 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 854 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 857 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 857 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 870 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 870 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 870 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 870 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 869 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 869 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 864 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 864 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 852 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 852 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 849 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 849 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 739 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 739 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 740 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 740 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 758 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 758 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 774 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 774 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 753 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 753 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 747 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 747 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 734 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 734 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 737 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 737 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 922 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 922 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 932 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 932 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 929 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 929 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 928 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 928 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 582 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 592 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 572 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 572 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 574 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 574 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 575 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 575 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32C5
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 931 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ 929 // Connected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_DIS 972 // Disconnected Initiator in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 937 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 937 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ 934 // Connected Initiator in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_DIS 934 // Disconnected Initiator in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 972 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ 974 // Connected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_DIS 974 // Disconnected Responder in 20MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 918 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 918 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ 922 // Connected Responder in 20MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_DIS 922 // Disconnected Responder in 20MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 817 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 812 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 822 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 822 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ 814 // Connected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_DIS 814 // Disconnected Initiator in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ 820 // Connected Initiator in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_DIS 820 // Disconnected Initiator in 40MHz (Ch 11) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 815 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 808 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 833 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ 860 // Connected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_DIS 817 // Disconnected Responder in 40MHz (Ch 1) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ 809 // Connected Responder in 40MHz (Ch 11) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_DIS 807 // Disconnected Responder in 40MHz (Ch 11) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 988 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ 986 // Connected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_DIS 988 // Disconnected Initiator in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 993 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 993 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ 992 // Connected Initiator in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_DIS 992 // Disconnected Initiator in 40MHz (Ch 11) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ 640 // Connected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_DIS 640 // Disconnected Responder in 40MHz (Ch 1) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 629 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 629 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ 631 // Connected Responder in 40MHz (Ch 11) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_DIS 631 // Disconnected Responder in 40MHz (Ch 11) using 40MHz FTM
#elif CONFIG_IDF_TARGET_ESP32S31
//TODO: Dummy values, remove or update when FTM loopback and auto-calibration is verified
// 20 MHz FTM in 20MHz PHY - Initiator Values
@@ -264,35 +264,35 @@
/********************************************** 5 GHz Values *******************************************************/
#if CONFIG_IDF_TARGET_ESP32C5
// 20 MHz FTM in 20MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G 975 // Connected Initiator in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G_DIS 976 // Disconnected Initiator in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_5G 976 // Connected Initiator in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_5G_DIS 980 // Disconnected Initiator in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G 930 // Connected Initiator in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20U_MHZ_5G_DIS 974 // Disconnected Initiator in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_5G 930 // Connected Initiator in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_20D_MHZ_5G_DIS 974 // Disconnected Initiator in 20MHz (Ch 149) using 20MHz FTM
// 20 MHz FTM in 20MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G 966 // Connected Responder in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G_DIS 966 // Disconnected Responder in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_5G 966 // Connected Responder in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_5G_DIS 962 // Disconnected Responder in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G 964 // Connected Responder in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20U_MHZ_5G_DIS 964 // Disconnected Responder in 20MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_5G 964 // Connected Responder in 20MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_20D_MHZ_5G_DIS 964 // Disconnected Responder in 20MHz (Ch 149) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G 798 // Connected Initiator in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G_DIS 840 // Disconnected Initiator in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_5G 798 // Connected Initiator in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_5G_DIS 845 // Disconnected Initiator in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G 794 // Connected Initiator in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40U_MHZ_5G_DIS 831 // Disconnected Initiator in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_5G 796 // Connected Initiator in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_INIT_FTM_COMP_20_40D_MHZ_5G_DIS 835 // Disconnected Initiator in 40MHz (Ch 149) using 20MHz FTM
// 20 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G 966 // Connected Responder in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G_DIS 828 // Disconnected Responder in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_5G 966 // Connected Responder in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_5G_DIS 824 // Disconnected Responder in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G 825 // Connected Responder in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40U_MHZ_5G_DIS 830 // Disconnected Responder in 40MHz (Ch 36) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_5G 829 // Connected Responder in 40MHz (Ch 149) using 20MHz FTM
#define EST_PHY_RESP_FTM_COMP_20_40D_MHZ_5G_DIS 830 // Disconnected Responder in 40MHz (Ch 149) using 20MHz FTM
// 40 MHz FTM in 40MHz PHY - Initiator Values
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G 825 // Connected Initiator in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G_DIS 823 // Disconnected Initiator in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_5G 827 // Connected Initiator in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_5G_DIS 825 // Disconnected Initiator in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G 780 // Connected Initiator in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40U_MHZ_5G_DIS 818 // Disconnected Initiator in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_5G 784 // Connected Initiator in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_INIT_FTM_COMP_40_40D_MHZ_5G_DIS 820 // Disconnected Initiator in 40MHz (Ch 149) using 40MHz FTM
// 40 MHz FTM in 40MHz PHY - Responder Values
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G 840 // Connected Responder in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G_DIS 840 // Disconnected Responder in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_5G 840 // Connected Responder in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_5G_DIS 840 // Disconnected Responder in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G 836 // Connected Responder in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40U_MHZ_5G_DIS 836 // Disconnected Responder in 40MHz (Ch 36) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_5G 837 // Connected Responder in 40MHz (Ch 149) using 40MHz FTM
#define EST_PHY_RESP_FTM_COMP_40_40D_MHZ_5G_DIS 837 // Disconnected Responder in 40MHz (Ch 149) using 40MHz FTM
#endif
#endif /* CONFIG_ESP_WIFI_FTM_ENABLE */

20
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@@ -594,7 +594,25 @@ typedef struct {
uint32_t vht_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT SU beamformee. */
uint32_t vht_mu_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT MU beamformee. */
uint32_t vht_mcs8_enabled: 1; /**< Whether to support VHT-MCS8. The default value is 0. */
uint32_t reserved2: 19; /**< Reserved for future feature set */
uint32_t max_bandwidth_negotiation_enabled_2g: 1; /**< Whether to enable maximum bandwidth negotiation for the 2.4GHz band.
In STA-only mode, when enabled, the negotiated bandwidth depends on the negotiated protocol:
(1) If the negotiated protocol is 802.11ax, the negotiated bandwidth is 20 MHz.
(2) If the negotiated protocol is 802.11n, the negotiated bandwidth is determined by the maximum bandwidth supported by both AP and STA.
(3) For other negotiated protocols, the negotiated bandwidth is 20 MHz.
SoftAP + STA coexistence is subject to the following hardware limitations:
- If SoftAP is configured to 802.11ax, STA bandwidth is capped at 20 MHz.
- If STA is connected at 40 MHz, SoftAP cannot be configured to 802.11ax/802.11ac.
The default value is 0 (disabled). */
uint32_t max_bandwidth_negotiation_enabled_5g: 1; /**< Whether to enable maximum bandwidth negotiation for the 5GHz band.
In STA-only mode, when enabled, the negotiated bandwidth depends on the negotiated protocol:
(1) If the negotiated protocol is 802.11ax/802.11ac, the negotiated bandwidth is 20 MHz.
(2) If the negotiated protocol is 802.11n/802.11an, the negotiated bandwidth is determined by the maximum bandwidth supported by both AP and STA.
(3) For other negotiated protocols, the negotiated bandwidth is 20 MHz.
SoftAP + STA coexistence is subject to the following hardware limitations:
- If SoftAP is configured to 802.11ax/802.11ac, STA bandwidth is capped at 20 MHz.
- If STA is connected at 40 MHz, SoftAP cannot be configured to 802.11ax/802.11ac.
The default value is 0 (disabled). */
uint32_t reserved2: 17; /**< Reserved for future feature set */
uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN]; /**< Password identifier for H2E. Strings null-terminated (length < SAE_H2E_IDENTIFIER_LEN) or non-null terminated (length = SAE_H2E_IDENTIFIER_LEN) are accepted. Non-null terminated string with 0xFF for full length of SAE_H2E_IDENTIFIER_LEN is not considered a valid identifier */
} wifi_sta_config_t;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 66c5b50174...9e91edcb2e

20
components/esp_wifi/remote/include/injected/esp_wifi_types_generic.h
View File

@@ -594,7 +594,25 @@ typedef struct {
uint32_t vht_su_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT SU beamformee. */
uint32_t vht_mu_beamformee_disabled: 1; /**< Whether to disable support for operation as an VHT MU beamformee. */
uint32_t vht_mcs8_enabled: 1; /**< Whether to support VHT-MCS8. The default value is 0. */
uint32_t reserved2: 19; /**< Reserved for future feature set */
uint32_t max_bandwidth_negotiation_enabled_2g: 1; /**< Whether to enable maximum bandwidth negotiation for the 2.4GHz band.
In STA-only mode, when enabled, the negotiated bandwidth depends on the negotiated protocol:
(1) If the negotiated protocol is 802.11ax, the negotiated bandwidth is 20 MHz.
(2) If the negotiated protocol is 802.11n, the negotiated bandwidth is determined by the maximum bandwidth supported by both AP and STA.
(3) For other negotiated protocols, the negotiated bandwidth is 20 MHz.
SoftAP + STA coexistence is subject to the following hardware limitations:
- If SoftAP is configured to 802.11ax, STA bandwidth is capped at 20 MHz.
- If STA is connected at 40 MHz, SoftAP cannot be configured to 802.11ax/802.11ac.
The default value is 0 (disabled). */
uint32_t max_bandwidth_negotiation_enabled_5g: 1; /**< Whether to enable maximum bandwidth negotiation for the 5GHz band.
In STA-only mode, when enabled, the negotiated bandwidth depends on the negotiated protocol:
(1) If the negotiated protocol is 802.11ax/802.11ac, the negotiated bandwidth is 20 MHz.
(2) If the negotiated protocol is 802.11n/802.11an, the negotiated bandwidth is determined by the maximum bandwidth supported by both AP and STA.
(3) For other negotiated protocols, the negotiated bandwidth is 20 MHz.
SoftAP + STA coexistence is subject to the following hardware limitations:
- If SoftAP is configured to 802.11ax/802.11ac, STA bandwidth is capped at 20 MHz.
- If STA is connected at 40 MHz, SoftAP cannot be configured to 802.11ax/802.11ac.
The default value is 0 (disabled). */
uint32_t reserved2: 17; /**< Reserved for future feature set */
uint8_t sae_h2e_identifier[SAE_H2E_IDENTIFIER_LEN]; /**< Password identifier for H2E. Strings null-terminated (length < SAE_H2E_IDENTIFIER_LEN) or non-null terminated (length = SAE_H2E_IDENTIFIER_LEN) are accepted. Non-null terminated string with 0xFF for full length of SAE_H2E_IDENTIFIER_LEN is not considered a valid identifier */
} wifi_sta_config_t;

6
components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c
View File

@@ -761,11 +761,7 @@ int nan_pasn_followup_decrypt_keys(const uint8_t *shared_key_attr,
key_desc = (const struct wpa_eapol_key *)(body + 1);
key_info = WPA_GET_BE16(key_desc->key_info);
if (!(key_info & WPA_KEY_INFO_KEY_TYPE)) {
wpa_printf(MSG_INFO,
"NAN: Follow-up frame does not contain pairwise key");
return -1;
}
/* iPhone/hostap set Key Type=0 (NIK is not a pairwise key); don't require the bit. */
if (!(key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
wpa_printf(MSG_INFO,
"NAN: Follow-up frame does not contain encrypted key data");