RE: [PATCH] wifi: rtlwifi: remove unreachable code in rtl92d_dm_check_edca_turbo()

[Ping-Ke Shih <pkshih@realtek.com>]

> -----Original Message-----
> From: Dmitry Antipov <dmantipov@yandex.ru>
> Sent: Friday, September 29, 2023 5:12 PM
> To: Ping-Ke Shih <pkshih@realtek.com>
> Cc: Kalle Valo <kvalo@kernel.org>; linux-wireless@vger.kernel.org; lvc-project@linuxtesting.org; Dmitry
> Antipov <dmantipov@yandex.ru>
> Subject: [PATCH] wifi: rtlwifi: remove unreachable code in rtl92d_dm_check_edca_turbo()
> 
> Since '!(0x5ea42b & 0xffff0000)' is always zero, remove unreachable

s/zero/false/ 

> block in 'rtl92d_dm_check_edca_turbo()' and convert EDCA limits to
> constant variables. Compile tested only.
> 
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> 
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
> ---
>  .../wireless/realtek/rtlwifi/rtl8192de/dm.c    | 18 ++----------------
>  1 file changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
> b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
> index 6cc9c7649eda..87798d7f5407 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c
> @@ -596,28 +596,14 @@ static void rtl92d_dm_check_edca_turbo(struct ieee80211_hw *hw)
>         static u64 last_rxok_cnt;
>         u64 cur_txok_cnt;
>         u64 cur_rxok_cnt;
> -       u32 edca_be_ul = 0x5ea42b;
> -       u32 edca_be_dl = 0x5ea42b;
> +       const u32 edca_be_ul = 0x5ea42b;
> +       const u32 edca_be_dl = 0x5ea42b;

move upward to have reverse X'mas tree order. 

> 
>         if (mac->link_state != MAC80211_LINKED) {
>                 rtlpriv->dm.current_turbo_edca = false;
>                 goto exit;
>         }
> 
> -       /* Enable BEQ TxOP limit configuration in wireless G-mode. */
> -       /* To check whether we shall force turn on TXOP configuration. */
> -       if ((!rtlpriv->dm.disable_framebursting) &&
> -           (rtlpriv->sec.pairwise_enc_algorithm == WEP40_ENCRYPTION ||
> -           rtlpriv->sec.pairwise_enc_algorithm == WEP104_ENCRYPTION ||
> -           rtlpriv->sec.pairwise_enc_algorithm == TKIP_ENCRYPTION)) {
> -               /* Force TxOP limit to 0x005e for UL. */
> -               if (!(edca_be_ul & 0xffff0000))
> -                       edca_be_ul |= 0x005e0000;
> -               /* Force TxOP limit to 0x005e for DL. */
> -               if (!(edca_be_dl & 0xffff0000))
> -                       edca_be_dl |= 0x005e0000;
> -       }
> -
>         if ((!rtlpriv->dm.is_any_nonbepkts) &&
>             (!rtlpriv->dm.disable_framebursting)) {
>                 cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
> --
> 2.41.0