staging: rtl8723bs: remove 5 GHz code

Acoording to the TODO code valid only for 5 GHz should be removed.

- find and remove remaining code valid only for 5 GHz. Most of the obvious
  ones have been removed, but things like channel > 14 still exist.

Remove code path only valid for channels > 14.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200913162206.19477-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index 6cb779bc9410697258d9b05477a1f504bb47de61..372ce17c3569b87d8f2c32bb3d4903044f57dd50 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -1724,26 +1724,17 @@ void update_wireless_mode(struct adapter *padapter)
        if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
                pmlmeinfo->HT_enable = 1;
 
-       if (pmlmeext->cur_channel > 14) {
-               if (pmlmeinfo->VHT_enable)
-                       network_type = WIRELESS_11AC;
-               else if (pmlmeinfo->HT_enable)
-                       network_type = WIRELESS_11_5N;
-
-               network_type |= WIRELESS_11A;
-       } else {
-               if (pmlmeinfo->VHT_enable)
-                       network_type = WIRELESS_11AC;
-               else if (pmlmeinfo->HT_enable)
-                       network_type = WIRELESS_11_24N;
-
-               if (rtw_is_cckratesonly_included(rate))
-                       network_type |= WIRELESS_11B;
-               else if (rtw_is_cckrates_included(rate))
-                       network_type |= WIRELESS_11BG;
-               else
-                       network_type |= WIRELESS_11G;
-       }
+       if (pmlmeinfo->VHT_enable)
+               network_type = WIRELESS_11AC;
+       else if (pmlmeinfo->HT_enable)
+               network_type = WIRELESS_11_24N;
+
+       if (rtw_is_cckratesonly_included(rate))
+               network_type |= WIRELESS_11B;
+       else if (rtw_is_cckrates_included(rate))
+               network_type |= WIRELESS_11BG;
+       else
+               network_type |= WIRELESS_11G;
 
        pmlmeext->cur_wireless_mode = network_type & padapter->registrypriv.wireless_mode;