From 75c02683c19d8db3ad7ab028b233ed7e62f57b52 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 16 Jan 2021 12:20:02 +0800 Subject: [PATCH] rtl8812au-ac: fix bug after enable concurrent mode support Fixes: 8ea8e4be955b10555745b9e408fd161d1b15e129 ("rtl8812au-ac: enable concurrent mode support") Signed-off-by: Tianling Shen --- .../0003-Add-missing-code-for-concurrent-mode.patch | 10 ++++++++++ .../0003-Remove-wdev-code-for-concurrent-mode.patch | 13 ------------- 2 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch delete mode 100644 package/ctcgfw/rtl8812au-ac/patches/0003-Remove-wdev-code-for-concurrent-mode.patch diff --git a/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch b/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch new file mode 100644 index 0000000000..f6af34d3e3 --- /dev/null +++ b/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch @@ -0,0 +1,10 @@ +--- a/os_dep/linux/os_intfs.c ++++ b/os_dep/linux/os_intfs.c +@@ -2803,6 +2803,7 @@ static int netdev_vir_if_close(struct net_device *pnetdev) + { + _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; ++ struct wireless_dev *wdev = padapter->rtw_wdev; + + RTW_INFO(FUNC_NDEV_FMT" , bup=%d\n", FUNC_NDEV_ARG(pnetdev), padapter->bup); + padapter->net_closed = _TRUE; diff --git a/package/ctcgfw/rtl8812au-ac/patches/0003-Remove-wdev-code-for-concurrent-mode.patch b/package/ctcgfw/rtl8812au-ac/patches/0003-Remove-wdev-code-for-concurrent-mode.patch deleted file mode 100644 index 4f644af4b7..0000000000 --- a/package/ctcgfw/rtl8812au-ac/patches/0003-Remove-wdev-code-for-concurrent-mode.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/os_dep/linux/os_intfs.c -+++ b/os_dep/linux/os_intfs.c -@@ -2817,8 +2817,10 @@ static int netdev_vir_if_close(struct net_device *pnetdev) - #endif - - #ifdef CONFIG_IOCTL_CFG80211 -+#ifndef CONFIG_CONCURRENT_MODE - wdev->iftype = NL80211_IFTYPE_MONITOR; - wdev->current_bss = NULL; -+#endif - rtw_scan_abort(padapter); - rtw_cfg80211_wait_scan_req_empty(padapter, 200); - adapter_wdev_data(padapter)->bandroid_scan = _FALSE;