[][MAC80211][hostapd][Fix PTA patch failed in Eagle]
[Description]
Fix PTA patch failed in Eagle
[Release-log]
N/A
Change-Id: Ifd23953ba7039e48dffad90185161fa3f2cdcc40
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6472315
diff --git a/autobuild_mac80211_release/package/network/services/hostapd/patches/921-Add-three-wire-PTA-ctrl-hostapd-vendor-command.patch b/autobuild_mac80211_release/package/network/services/hostapd/patches/921-Add-three-wire-PTA-ctrl-hostapd-vendor-command.patch
index 5257898..a3d8837 100644
--- a/autobuild_mac80211_release/package/network/services/hostapd/patches/921-Add-three-wire-PTA-ctrl-hostapd-vendor-command.patch
+++ b/autobuild_mac80211_release/package/network/services/hostapd/patches/921-Add-three-wire-PTA-ctrl-hostapd-vendor-command.patch
@@ -1,4 +1,4 @@
-From fc638478a8a2eb45e023557bee5c0aefdf0bba6d Mon Sep 17 00:00:00 2001
+From 1bd8935beffa0d94c34a2ba4f3400c65b8629250 Mon Sep 17 00:00:00 2001
From: StanleyYP Wang <StanleyYP.Wang@mediatek.com>
Date: Fri, 2 Sep 2022 01:03:23 +0800
Subject: [PATCH] Add three wire PTA ctrl hostapd vendor command
@@ -46,21 +46,16 @@
return conf;
}
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
-index 737cc2f..1402891 100644
+index 7528430..99edb49 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
-@@ -1153,6 +1153,7 @@ struct hostapd_config {
+@@ -1153,6 +1153,19 @@ struct hostapd_config {
unsigned int ch_switch_eht_config;
u8 edcca_enable;
s8 edcca_compensation;
+ u8 three_wire_enable;
- };
-
- enum edcca_mode {
-@@ -1164,6 +1165,18 @@ enum edcca_mode {
- #define EDCCA_MIN_COMPENSATION -126
- #define EDCCA_MAX_COMPENSATION 126
-
++};
++
+enum three_wire_mode {
+ THREE_WIRE_MODE_DISABLE,
+ THREE_WIRE_MODE_EXT0_ENABLE,
@@ -71,16 +66,14 @@
+ NUM_THREE_WIRE_MODE,
+ THREE_WIRE_MODE_MAX =
+ NUM_THREE_WIRE_MODE - 1
-+};
-+
- static inline u8 hostapd_get_oper_chwidth(struct hostapd_config *conf)
- {
- #ifdef CONFIG_IEEE80211BE
+ };
+
+ enum edcca_mode {
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
-index 3de6748..a48c22e 100644
+index 5545232..77d5f89 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
-@@ -1035,3 +1035,14 @@ int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff)
+@@ -1038,3 +1038,14 @@ int hostapd_drv_hemu_dump(struct hostapd_data *hapd, u8 *hemu_onoff)
return 0;
return hapd->driver->hemu_dump(hapd->drv_priv, hemu_onoff);
}
@@ -108,7 +101,7 @@
#include "drivers/driver.h"
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
-index 3b752fc..0c02171 100644
+index 0f3691b..32b75dc 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -2299,6 +2299,8 @@ dfs_offload:
@@ -155,10 +148,10 @@
MTK_VENDOR_ATTR_CSI_CTRL_UNSPEC,
diff --git a/src/drivers/driver.h b/src/drivers/driver.h
-index 6cc7e9b..0048120 100644
+index 0f12feb..79e80b6 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
-@@ -4688,6 +4688,7 @@ struct wpa_driver_ops {
+@@ -4689,6 +4689,7 @@ struct wpa_driver_ops {
*/
int (*hemu_ctrl)(void *priv, u8 hemu_onoff);
int (*hemu_dump)(void *priv, u8 *hemu_onoff);
@@ -167,10 +160,10 @@
/**
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
-index 0009fb4..5834720 100644
+index b2c3a2e..02f4b95 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
-@@ -12500,6 +12500,38 @@ static int nl80211_configure_edcca_threshold(void *priv,
+@@ -12505,6 +12505,38 @@ static int nl80211_configure_edcca_threshold(void *priv,
return ret;
}
@@ -209,7 +202,7 @@
const struct wpa_driver_ops wpa_driver_nl80211_ops = {
.name = "nl80211",
-@@ -12650,4 +12682,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
+@@ -12655,4 +12687,5 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
#endif /* CONFIG_TESTING_OPTIONS */
/* Need ifdef CONFIG_DRIVER_NL80211_MTK */
.configure_edcca_threshold = nl80211_configure_edcca_threshold,