summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Marangi2025-12-02 19:31:26 +0000
committerChristian Marangi2025-12-07 23:37:08 +0000
commitcc20942931543387d39221266829e2eabfe67d38 (patch)
treee49c1b141414260fccb09375e67b956c6783c856
parentc8855881eabf5f67456576284091580eae0561d0 (diff)
downloadopenwrt-cc20942931543387d39221266829e2eabfe67d38.tar.gz
rtl8812au-ct: rework patch to support kernel 6.18
Rework patch to support backports package based on kernel 6.18. Link: https://github.com/openwrt/openwrt/pull/20964 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-rw-r--r--package/kernel/rtl8812au-ct/patches/100-api_update.patch28
-rw-r--r--package/kernel/rtl8812au-ct/patches/110-link_id.patch6
2 files changed, 30 insertions, 4 deletions
diff --git a/package/kernel/rtl8812au-ct/patches/100-api_update.patch b/package/kernel/rtl8812au-ct/patches/100-api_update.patch
index ca888d6963..d5cc72bedc 100644
--- a/package/kernel/rtl8812au-ct/patches/100-api_update.patch
+++ b/package/kernel/rtl8812au-ct/patches/100-api_update.patch
@@ -44,7 +44,33 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE)
, bool unicast, bool multicast
#endif
-@@ -4031,7 +4034,8 @@ static int cfg80211_rtw_change_beacon(st
+@@ -2349,7 +2352,7 @@ exit:
+
+ }
+
+-static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
++static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed)
+ {
+ #if 0
+ struct iwm_priv *iwm = wiphy_to_iwm(wiphy);
+@@ -3142,6 +3145,7 @@ static int cfg80211_rtw_set_txpower(stru
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+ struct wireless_dev *wdev,
+ #endif
++ int radio_idx,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) || defined(COMPAT_KERNEL_RELEASE)
+ enum nl80211_tx_power_setting type, int mbm)
+ #else
+@@ -3180,7 +3184,7 @@ static int cfg80211_rtw_set_txpower(stru
+
+ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
+- struct wireless_dev *wdev,
++ struct wireless_dev *wdev, int radio_idx,
+ #endif
+ int *dbm)
+ {
+@@ -4031,7 +4035,8 @@ static int cfg80211_rtw_change_beacon(st
return ret;
}
diff --git a/package/kernel/rtl8812au-ct/patches/110-link_id.patch b/package/kernel/rtl8812au-ct/patches/110-link_id.patch
index 70121c27be..ae2e224aab 100644
--- a/package/kernel/rtl8812au-ct/patches/110-link_id.patch
+++ b/package/kernel/rtl8812au-ct/patches/110-link_id.patch
@@ -1,11 +1,11 @@
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -3183,7 +3183,7 @@ static int cfg80211_rtw_set_txpower(stru
+@@ -3184,7 +3184,7 @@ static int cfg80211_rtw_set_txpower(stru
static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
-- struct wireless_dev *wdev,
-+ struct wireless_dev *wdev, unsigned int link_id,
+- struct wireless_dev *wdev, int radio_idx,
++ struct wireless_dev *wdev, int radio_idx, unsigned int link_id,
#endif
int *dbm)
{