Merge branch 'bugfix/correct_action_frame' into 'master'

jack0c · jack0c · commit 7cbbabb17ced · 2024-04-22T19:11:37.000+08:00
fix(esp_wifi): Correct frame subtype in send_mgmt_frame API

Closes WIFIBUG-520

See merge request espressif/esp-idf!30363
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 0565ffa6951b47df93dbca0aee94eafff64c9ade
+Subproject commit 516ae8c586881cc71c9f5a464e4f40cb3014b58f
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_common.c b/components/wpa_supplicant/esp_supplicant/src/esp_common.c
@@ -870,7 +870,7 @@ int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
     }
 
     req->ifx = WIFI_IF_STA;
-    req->subtype = WLAN_FC_STYPE_ACTION;
+    req->subtype = (WLAN_FC_STYPE_ACTION << 4);
     req->data_len = data_len;
     os_memcpy(req->data, data, req->data_len);
 
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpa3.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpa3.c
@@ -633,7 +633,7 @@ int esp_send_sae_auth_reply(struct hostapd_data *hapd,
     os_memcpy(&((uint16_t *)req->data)[3], ies, ies_len - 3 * sizeof(uint16_t));
 
     req->ifx = WIFI_IF_AP;
-    req->subtype = WLAN_FC_STYPE_AUTH;
+    req->subtype = (WLAN_FC_STYPE_AUTH << 4);
     req->data_len = ies_len;
     os_memcpy(req->da, bssid, ETH_ALEN);
 

Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ int wpa_drv_send_action(struct wpa_supplicant *wpa_s,`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`req->ifx = WIFI_IF_STA;`
`873`		`- req->subtype = WLAN_FC_STYPE_ACTION;`
	`873`	`+ req->subtype = (WLAN_FC_STYPE_ACTION << 4);`
`874`	`874`	`req->data_len = data_len;`
`875`	`875`	`os_memcpy(req->data, data, req->data_len);`
`876`	`876`