From 424161b608ee3ab607a38e9cc30b7322e2a1936b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 20 Sep 2023 19:11:00 +0800 Subject: [PATCH] rtl8812au-ac: bump to latest git HEAD Signed-off-by: Tianling Shen (cherry picked from commit 912145642143fb34d48848d4f607ab74a2f42b62) --- package/kernel/rtl8812au-ac/Makefile | 6 +- .../010-disable-default-build-x86.patch | 2 +- ...add-missing-code-for-concurrent-mode.patch | 2 +- .../patches/040-wireless-5.8.patch | 65 +++++++++---------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 52d721dc32..24a9940f5c 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-12-23 -PKG_SOURCE_VERSION:=ee299797bcd54d5b8c58d2da8576c54cea1a03a2 -PKG_MIRROR_HASH:=fb72b28e123f9dead470a0b94ef9d56e59c10e4f0baf09ba820e5c34a743decc +PKG_SOURCE_DATE:=2023-07-23 +PKG_SOURCE_VERSION:=04f600ee54a414b871aea509fcd4709838c8c522 +PKG_MIRROR_HASH:=df8aa45fb2bc2bc706b8fe49b4b7c4216b64232286845bb7dc231d0be309ccac 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 1cfa22bd9a..d41aa79200 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 -@@ -98,7 +98,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y +@@ -93,7 +93,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/030-add-missing-code-for-concurrent-mode.patch b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch index 32fe0e0644..28d18f25ff 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 -@@ -2807,6 +2807,7 @@ static int netdev_vir_if_close(struct ne +@@ -2778,6 +2778,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 90384a109f..165f7abfe9 100644 --- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch +++ b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch @@ -1,36 +1,33 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -460,9 +460,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte +@@ -460,7 +460,7 @@ 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, 1, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 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)) cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); --#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(BUILD_OPENWRT)) - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); - #else - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0); -@@ -474,7 +474,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte +@@ -476,7 +476,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) goto exit; --#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(6, 3, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(BUILD_OPENWRT)) + cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); - #else - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef); -@@ -1151,7 +1151,7 @@ check_bss: +@@ -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)) - roam_info.links[0].bssid = cur_network->network.MacAddress; - #else +- #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) && !defined(BUILD_OPENWRT)) + roam_info.channel = notify_channel; roam_info.bssid = cur_network->network.MacAddress; -@@ -1721,7 +1721,7 @@ exit: + #endif +@@ -1738,7 +1738,7 @@ exit: } static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev @@ -39,7 +36,7 @@ , int link_id #endif , u8 key_index -@@ -1868,7 +1868,7 @@ addkey_end: +@@ -1885,7 +1885,7 @@ addkey_end: } static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev @@ -48,7 +45,7 @@ , int link_id #endif , u8 keyid -@@ -2036,7 +2036,7 @@ exit: +@@ -2053,7 +2053,7 @@ exit: } static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, @@ -57,7 +54,7 @@ int link_id, #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -@@ -2060,7 +2060,7 @@ static int cfg80211_rtw_del_key(struct w +@@ -2077,7 +2077,7 @@ static int cfg80211_rtw_del_key(struct w static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, struct net_device *ndev, @@ -66,7 +63,7 @@ int link_id, #endif u8 key_index -@@ -2112,7 +2112,7 @@ static int cfg80211_rtw_set_default_key( +@@ -2129,7 +2129,7 @@ static int cfg80211_rtw_set_default_key( #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *ndev, @@ -75,7 +72,7 @@ int link_id, #endif u8 key_index) -@@ -5248,7 +5248,7 @@ static int cfg80211_rtw_change_beacon(st +@@ -5267,7 +5267,7 @@ static int cfg80211_rtw_change_beacon(st return ret; } @@ -84,7 +81,7 @@ static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) #else static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) -@@ -6125,7 +6125,7 @@ static int cfg80211_rtw_set_channel(stru +@@ -6143,7 +6143,7 @@ static int cfg80211_rtw_set_channel(stru return 0; } @@ -93,7 +90,7 @@ 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){ -@@ -10434,9 +10434,9 @@ void rtw_wdev_unregister(struct wireless +@@ -10432,9 +10432,9 @@ 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) @@ -107,16 +104,16 @@ if (wdev->current_bss) { --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -1740,7 +1740,7 @@ int rtw_os_ndev_register(_adapter *adapt - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) +@@ -1734,7 +1734,7 @@ int rtw_os_ndev_register(_adapter *adapt + u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj); + + #ifdef CONFIG_RTW_NAPI +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT)) 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); - #endif - #endif /* CONFIG_RTW_NAPI */ - -@@ -2823,7 +2823,13 @@ static int netdev_vir_if_close(struct ne + netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); +@@ -2794,7 +2794,13 @@ static int netdev_vir_if_close(struct ne #ifdef CONFIG_IOCTL_CFG80211 wdev->iftype = NL80211_IFTYPE_MONITOR;