espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/add_ht2040_ex_caps_v44' into 'release/v4.4'

Browse Source 
Add HT20_40 capability in assoc requests(v4.4)

See merge request espressif/esp-idf!27247
This commit is contained in:
Jiang Jiang Jian
2023-11-21 10:46:26 +08:00
parent b3370564f8 cf828f1c8d
commit 0f679c740f
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: a91050f77b...2b4ec04f76

9
components/wpa_supplicant/esp_supplicant/src/esp_common.c
View File

@ -21,6 +21,7 @@
#include "esp_rrm.h"
#include "esp_wnm.h"
#include "rsn_supp/wpa.h"
#include "esp_private/wifi.h"
struct wpa_supplicant g_wpa_supp;
@ -550,6 +551,7 @@ static uint8_t get_extended_caps_ie(uint8_t *ie, size_t len)
uint8_t ext_caps_ie[5] = {0};
uint8_t ext_caps_ie_len = 3;
uint8_t *pos = ext_caps_ie;
wifi_ioctl_config_t cfg = {0};
if (!esp_wifi_is_btm_enabled_internal(WIFI_IF_STA)) {
return 0;
@ -557,7 +559,12 @@ static uint8_t get_extended_caps_ie(uint8_t *ie, size_t len)
*pos++ = WLAN_EID_EXT_CAPAB;
*pos++ = ext_caps_ie_len;
*pos++ = 0;
esp_err_t err = esp_wifi_internal_ioctl(WIFI_IOCTL_GET_STA_HT2040_COEX, &cfg);
if (err == ESP_OK && cfg.data.ht2040_coex.enable) {
*pos++ |= BIT(WLAN_EXT_CAPAB_20_40_COEX);
} else {
*pos++ = 0;
}
*pos++ = 0;
#define CAPAB_BSS_TRANSITION BIT(3)
*pos |= CAPAB_BSS_TRANSITION;

1
components/wpa_supplicant/src/common/ieee802_11_defs.h
View File

@ -258,6 +258,7 @@
/* bits 0-3: Field length (n-1) */
#define WLAN_RSNX_CAPAB_SAE_H2E 5
#define WLAN_EXT_CAPAB_20_40_COEX 0
#define WLAN_EXT_CAPAB_BSS_TRANSITION 19
/* Action frame categories (IEEE Std 802.11-2016, 9.4.1.11, Table 9-76) */