Merge branch 'fix/backport_wifi_issues_v6.1' into 'release/v6.1'

Backport a few wifi fixes (Backport v6.1)

See merge request espressif/esp-idf!51224
This commit is contained in:
Jiang Jiang Jian
2026-08-01 07:28:52 +08:00
2 changed files with 3 additions and 3 deletions

View File

@@ -2230,7 +2230,7 @@ uint8_t esp_wifi_nan_publish_service(const wifi_nan_publish_cfg_t *publish_cfg)
}
#ifdef CONFIG_ESP_WIFI_NAN_PAIRING
if (cfg->pairing && nan_check_paired_service_hash(service_id)) {
if (cfg->pairing && cfg->pairing->npk_nik_caching && nan_check_paired_service_hash(service_id)) {
cfg->pairing->pairing_setup = false;
}
#endif
@@ -2412,7 +2412,7 @@ uint8_t esp_wifi_nan_subscribe_service(const wifi_nan_subscribe_cfg_t *subscribe
}
#ifdef CONFIG_ESP_WIFI_NAN_PAIRING
if (cfg->pairing && nan_check_paired_service_hash(service_id)) {
if (cfg->pairing && cfg->pairing->npk_nik_caching && nan_check_paired_service_hash(service_id)) {
cfg->pairing->pairing_setup = false;
}
#endif