[openwrt/openwrt] kernel: 5.10: fix rtl8812au-ct build

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/57fdcf66f0c2ae4410a169dfbc1bd5a2c66771b0

commit 57fdcf66f0c2ae4410a169dfbc1bd5a2c66771b0
Author: Ilya Lipnitskiy <ilya.lipnitskiy at gmail.com>
AuthorDate: Thu Feb 18 16:34:43 2021 -0800

    kernel: 5.10: fix rtl8812au-ct build
    
    Pull in upstream:
    https://github.com/greearb/rtl8812AU_8821AU_linux/commit/c8d243936fed0c5fe1d77a06b36d26f41c8c46f4
    https://github.com/greearb/rtl8812AU_8821AU_linux/commit/1e9689c89fa627d2d764ba0e8359fd444fe8458f
    
    Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy at gmail.com>
---
 package/kernel/rtl8812au-ct/Makefile                    |  8 ++++----
 .../kernel/rtl8812au-ct/patches/003-wireless-5.8.patch  | 17 +++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/package/kernel/rtl8812au-ct/Makefile b/package/kernel/rtl8812au-ct/Makefile
index aac754de7f..9c6cf6e7f2 100644
--- a/package/kernel/rtl8812au-ct/Makefile
+++ b/package/kernel/rtl8812au-ct/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8812au-ct
-PKG_RELEASE=2
+PKG_RELEASE=1
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/greearb/rtl8812AU_8821AU_linux.git
-PKG_MIRROR_HASH:=fa689e034cad9e4683ea784b8f3cb590492ab5c68e8babd492a4e8bf2de3b114
+PKG_MIRROR_HASH:=09e33b1cede3f4457d4324fe30ea5fb92b240bcd6e647bbb689fa336f3b07968
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-01-12
-PKG_SOURCE_VERSION:=e0d586aa93cb8687dd7dc0e593b6a820df2d6e1d
+PKG_SOURCE_DATE:=2020-12-07
+PKG_SOURCE_VERSION:=1e9689c89fa627d2d764ba0e8359fd444fe8458f
 
 PKG_MAINTAINER:=Ben Greear <greearb at candelatech.com>
 PKG_BUILD_PARALLEL:=1
diff --git a/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch b/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch
index 64c5ab162b..67ebb82b38 100644
--- a/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch
+++ b/package/kernel/rtl8812au-ct/patches/003-wireless-5.8.patch
@@ -1,6 +1,6 @@
 --- a/os_dep/linux/ioctl_cfg80211.c
 +++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -5177,6 +5177,14 @@ exit:
+@@ -5177,6 +5177,15 @@ exit:
  	return ret;
  }
  
@@ -11,19 +11,12 @@
 +{
 +
 +}
-+#else
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
-         struct wireless_dev *wdev,
-@@ -5205,6 +5213,7 @@ static void cfg80211_rtw_mgmt_frame_regi
- exit:
- 	return;
- }
 +#endif
- 
++ 
  #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
  static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
-@@ -6019,7 +6028,10 @@ static struct cfg80211_ops rtw_cfg80211_
+ 		struct net_device *ndev,
+@@ -5990,7 +5999,10 @@ static struct cfg80211_ops rtw_cfg80211_
  	.cancel_remain_on_channel = cfg80211_rtw_cancel_remain_on_channel,
  #endif
  
@@ -33,5 +26,5 @@
 +	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
 +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
  	.mgmt_tx = cfg80211_rtw_mgmt_tx,
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
  #elif  (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35))
+ 	.action = cfg80211_rtw_mgmt_tx,