wifi: rtlwifi: remove unused dualmac control leftovers

[ Upstream commit 557123259200b30863e1b6a8f24a8c8060b6fc1d ]

Remove 'struct rtl_dualmac_easy_concurrent_ctl' of 'struct rtl_priv'
and related code in '_rtl_pci_tx_chk_waitq()'.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230602065940.149198-2-dmantipov@yandex.ru
Stable-dep-of: 2fdac64c3c35 ("wifi: rtlwifi: remove unused check_buddy_priv")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index f17a365fba07072aec6324211bd056649b4cfef1..0dcf5350e0885f6452a0144a12786de2731d67e9 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -443,11 +443,6 @@ static void _rtl_pci_tx_chk_waitq(struct ieee80211_hw *hw)
        if (!rtlpriv->rtlhal.earlymode_enable)
                return;
 
-       if (rtlpriv->dm.supp_phymode_switch &&
-           (rtlpriv->easy_concurrent_ctl.switch_in_process ||
-           (rtlpriv->buddy_priv &&
-           rtlpriv->buddy_priv->easy_concurrent_ctl.switch_in_process)))
-               return;
        /* we just use em for BE/BK/VI/VO */
        for (tid = 7; tid >= 0; tid--) {
                u8 hw_queue = ac_to_hwq[rtl_tid_to_ac(tid)];

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index d1b36760c8948ba5b3695a3166643a1ef58d85e9..f22891c73ade17ae6383dc88575f780991482e95 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2496,14 +2496,6 @@ struct rtl_debug {
 #define MIMO_PS_DYNAMIC                        1
 #define MIMO_PS_NOLIMIT                        3
 
-struct rtl_dualmac_easy_concurrent_ctl {
-       enum band_type currentbandtype_backfordmdp;
-       bool close_bbandrf_for_dmsp;
-       bool change_to_dmdp;
-       bool change_to_dmsp;
-       bool switch_in_process;
-};
-
 struct rtl_dmsp_ctl {
        bool activescan_for_slaveofdmsp;
        bool scan_for_anothermac_fordmsp;
@@ -2744,7 +2736,6 @@ struct rtl_priv {
        struct list_head list;
        struct rtl_priv *buddy_priv;
        struct rtl_global_var *glb_var;
-       struct rtl_dualmac_easy_concurrent_ctl easy_concurrent_ctl;
        struct rtl_dmsp_ctl dmsp_ctl;
        struct rtl_locks locks;
        struct rtl_works works;