On Fri, 2023-06-02 at 08:29 +0300, Dmitry Antipov wrote:
>
> Remove 'struct rtl_dualmac_easy_concurrent_ctl' of 'struct rtl_priv'
> and related code in '_rtl_pci_tx_chk_waitq()'.
>
> This is a followup of bc4b83d64077 ("wifi: rtlwifi: remove unused
> timer and related code").
Mention commit SHA1 only if it gets merged in wireless-next at least.
If want to say their dependency, you can describe the dependency
followed by '---' like changelog, but better way is that you can
send two patches in single one patchset.
>
> Signed-off-by: Dmitry Antipov <dmantipov@xxxxxxxxx>
> ---
> drivers/net/wireless/realtek/rtlwifi/pci.c | 5 -----
> drivers/net/wireless/realtek/rtlwifi/wifi.h | 9 ---------
> 2 files changed, 14 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c
> b/drivers/net/wireless/realtek/rtlwifi/pci.c
> index ca79f652fef3..028a7c97bacf 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/pci.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
> @@ -482,11 +482,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 bc1d68cb9183..307e059ec8aa 100644
> --- 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;
> --
> 2.40.1
>
