From 20cda6424d9f8731588611f7c3754726854ee9ae Mon Sep 17 00:00:00 2001
From: yinqingzhao <yinqingzhao@espressif.com>
Date: Tue, 3 Dec 2024 17:15:00 +0800
Subject: [PATCH] feat(wifi): wifi support 80211tx using 11ax and 11ac rate

---
 components/esp_wifi/include/esp_now.h          | 11 ++---------
 components/esp_wifi/include/esp_wifi.h         | 18 +++++++++++++++++-
 .../esp_wifi/include/esp_wifi_types_generic.h  | 13 ++++++++++++-
 components/esp_wifi/lib                        |  2 +-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/components/esp_wifi/include/esp_now.h b/components/esp_wifi/include/esp_now.h
index 60b5cd9ee4..e0261375bb 100644
--- a/components/esp_wifi/include/esp_now.h
+++ b/components/esp_wifi/include/esp_now.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -93,15 +93,8 @@ typedef struct esp_now_recv_info {
 
 /**
  * @brief ESPNOW rate config
- *
  */
-typedef struct esp_now_rate_config {
-    wifi_phy_mode_t phymode;                 /**< ESPNOW phymode of specified interface */
-    wifi_phy_rate_t rate;                    /**< ESPNOW rate of specified interface */
-    bool ersu;                               /**< ESPNOW using ERSU to send frame, ERSU is a transmission mode related to 802.11 ax.
-                                                  ERSU is always used in long distance transmission, and its frame has lower rate compared with SU mode */
-    bool dcm;                                /**< ESPNOW using dcm rate to send frame */
-} esp_now_rate_config_t;
+typedef wifi_tx_rate_config_t esp_now_rate_config_t;
 
 /**
   * @brief     Callback function of receiving ESPNOW data
diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index 286036e40a..fa9c40e868 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1529,6 +1529,7 @@ esp_err_t esp_wifi_get_country_code(char *country);
   * @brief      Config 80211 tx rate of specified interface
   *
   * @attention  1. This API should be called after esp_wifi_init() and before esp_wifi_start().
+  * @attention  2. Can not set 80211 tx rate under 11A/11AC/11AX protocol, you can use esp_wifi_config_80211_tx instead.
   *
   * @param      ifx  Interface to be configured.
   * @param      rate Phy rate to be configured.
@@ -1539,6 +1540,21 @@ esp_err_t esp_wifi_get_country_code(char *country);
   */
 esp_err_t esp_wifi_config_80211_tx_rate(wifi_interface_t ifx, wifi_phy_rate_t rate);
 
+/**
+  * @brief      Config 80211 tx rate and phymode of specified interface
+  *
+  * @attention  1. This API should be called after esp_wifi_init() and before esp_wifi_start().
+
+  *
+  * @param      ifx  Interface to be configured.
+  * @param      config rate_config to be configured.
+  *
+  * @return
+  *    - ESP_OK: succeed
+  *    - others: failed
+  */
+esp_err_t esp_wifi_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *config);
+
 /**
   * @brief      Disable PMF configuration for specified interface
   *
diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
index d57ee0d4df..e2472a57dc 100644
--- a/components/esp_wifi/include/esp_wifi_types_generic.h
+++ b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -1213,6 +1213,17 @@ typedef enum {
     WIFI_BAND_2G_5G = 3,                /* Band is 2,4G + 5G */
 } wifi_band_t;
 
+/**
+  * @brief Argument structure for wifi_tx_rate_config
+  */
+typedef struct {
+    wifi_phy_mode_t phymode;                 /**< Phymode of specified interface */
+    wifi_phy_rate_t rate;                    /**< Rate of specified interface */
+    bool ersu;                               /**< Using ERSU to send frame, ERSU is a transmission mode related to 802.11 ax.
+                                                  ERSU is always used in long distance transmission, and its frame has lower rate compared with SU mode */
+    bool dcm;                                /**< Using dcm rate to send frame */
+} wifi_tx_rate_config_t;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 19143aa249..4ecb60fcbb 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 19143aa24991ff1624d8098508d039e89edc4172
+Subproject commit 4ecb60fcbb3ce42e207df15e114c66c22f43e6b6