From 6503996249bbc8042b7dc2fb01598c7da8421e29 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 15 Jul 2024 13:28:08 +0800 Subject: [PATCH] rtl8812au-ac: bump to latest git HEAD Signed-off-by: Tianling Shen --- package/kernel/rtl8812au-ac/Makefile | 8 +- .../010-disable-default-build-x86.patch | 2 +- ...nge-value-of-vht-enable-and-usb-mode.patch | 4 +- ...add-missing-code-for-concurrent-mode.patch | 2 +- .../patches/040-wireless-5.8.patch | 95 ++++++++++--------- 5 files changed, 60 insertions(+), 51 deletions(-) diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 009321f03d..282c7ebb1d 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl8812au-ac -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-07-23 -PKG_SOURCE_VERSION:=04f600ee54a414b871aea509fcd4709838c8c522 -PKG_MIRROR_HASH:=9acb09b70c2f9461e20fad84b1228355d63a2651578e2d40442686def086a479 +PKG_SOURCE_DATE:=2024-04-09 +PKG_SOURCE_VERSION:=63cf0b4584aa8878b0fe8ab38017f31c319bde3d +PKG_MIRROR_HASH:=74c1375f56e1f2122e0ec2a78a200fca43719e354c9db845625f6e6f08fa863a PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch b/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch index d41aa79200..6856138d80 100644 --- a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch +++ b/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -93,7 +93,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y +@@ -97,7 +97,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = n ###################### Platform Related ####################### diff --git a/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch b/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch index 3c7bfdf13e..44fed1c2ac 100644 --- a/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch +++ b/package/kernel/rtl8812au-ac/patches/020-change-value-of-vht-enable-and-usb-mode.patch @@ -1,6 +1,6 @@ --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -254,7 +254,7 @@ int rtw_bfee_rf_number = 0; /*Beamformee +@@ -258,7 +258,7 @@ int rtw_bfee_rf_number = 0; /*Beamformee #endif /* CONFIG_80211N_HT */ #ifdef CONFIG_80211AC_VHT @@ -9,7 +9,7 @@ module_param(rtw_vht_enable, int, 0644); int rtw_ampdu_factor = 7; -@@ -324,7 +324,7 @@ int rtw_drv_ant_band_switch = 1; /* 0:OF +@@ -328,7 +328,7 @@ int rtw_drv_ant_band_switch = 1; /* 0:OF int rtw_single_ant_path; /*0:main ant , 1:aux ant , Fixed single antenna path, default main ant*/ /* 0: doesn't switch, 1: switch from usb2.0 to usb 3.0 2: switch from usb3.0 to usb 2.0 */ diff --git a/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch index 28d18f25ff..fb44f9ec23 100644 --- a/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch +++ b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch @@ -1,6 +1,6 @@ --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -2778,6 +2778,7 @@ static int netdev_vir_if_close(struct ne +@@ -2782,6 +2782,7 @@ static int netdev_vir_if_close(struct ne { _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; diff --git a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch index 33be79e391..c31b78bb93 100644 --- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch +++ b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch @@ -1,29 +1,35 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -460,7 +460,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte +@@ -460,9 +460,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) if (started) { --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(BUILD_OPENWRT)) +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT) cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0); - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) +-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); -@@ -476,7 +476,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) || (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8,0)) + cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); +@@ -476,9 +476,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) goto exit; --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(BUILD_OPENWRT)) +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT) cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) +-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); + #else + cfg80211_ch_switch_notify(adapter->pnetdev, &chdef); @@ -1155,7 +1155,7 @@ check_bss: #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) && !defined(BUILD_OPENWRT)) ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) && !defined(BUILD_OPENWRT) roam_info.channel = notify_channel; roam_info.bssid = cur_network->network.MacAddress; #endif @@ -32,7 +38,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) , int link_id #endif , u8 key_index @@ -41,7 +47,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) , int link_id #endif , u8 keyid @@ -50,7 +56,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) int link_id, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) @@ -59,7 +65,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, struct net_device *ndev, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) int link_id, #endif u8 key_index @@ -68,65 +74,68 @@ int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT) int link_id, #endif u8 key_index) -@@ -5267,7 +5267,7 @@ static int cfg80211_rtw_change_beacon(st +@@ -5283,7 +5283,7 @@ exit: return ret; } --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT)) - static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) - #else +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(BUILD_OPENWRT) + static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, + struct cfg80211_ap_update *params) + { +@@ -5315,7 +5315,7 @@ static int cfg80211_rtw_change_beacon(st + return ret; + } + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 2)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 2)) && !defined(BUILD_OPENWRT) static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) -@@ -6143,7 +6143,7 @@ static int cfg80211_rtw_set_channel(stru + #else + static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) +@@ -6191,7 +6191,7 @@ static int cfg80211_rtw_set_channel(stru return 0; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id, struct cfg80211_chan_def *chandef){ #else static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, struct cfg80211_chan_def *chandef){ -@@ -10432,9 +10432,9 @@ void rtw_wdev_unregister(struct wireless +@@ -7862,7 +7862,7 @@ static int cfg80211_rtw_tdls_mgmt(struct + #else + u8 *peer, + #endif +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) || defined(BUILD_OPENWRT) + int link_id, + #endif + u8 action_code, +@@ -10484,7 +10484,7 @@ void rtw_wdev_unregister(struct wireless rtw_cfg80211_indicate_scan_done(adapter, _TRUE); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE) -- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)) -+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) +- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) ++ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || defined(BUILD_OPENWRT) if (wdev->links[0].client.current_bss) { -- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) -+ #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(BUILD_OPENWRT)) + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) if (wdev->connected) { - #else - if (wdev->current_bss) { --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -1737,7 +1737,11 @@ int rtw_os_ndev_register(_adapter *adapt - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) - netif_napi_add_weight(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); - #else -- netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -+ netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll -+#ifndef BUILD_OPENWRT -+ , RTL_NAPI_WEIGHT -+#endif -+ ); - #endif - #endif /* CONFIG_RTW_NAPI */ - -@@ -2794,7 +2798,13 @@ static int netdev_vir_if_close(struct ne +@@ -2798,7 +2798,13 @@ static int netdev_vir_if_close(struct ne #ifdef CONFIG_IOCTL_CFG80211 wdev->iftype = NL80211_IFTYPE_MONITOR; +- wdev->current_bss = NULL; + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT)) + wdev->links[0].client.current_bss = NULL; + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) + wdev->connected = NULL; + #else - wdev->current_bss = NULL; ++ wdev->current_bss = NULL; + #endif rtw_scan_abort(padapter); rtw_cfg80211_wait_scan_req_empty(padapter, 200);