staging: rtl8723bs: remove 5 GHz code
authorMichael Straube <straube.linux@gmail.com>
Thu, 13 Aug 2020 06:50:53 +0000 (08:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Aug 2020 14:07:17 +0000 (16:07 +0200)
According to the TODO 5 GHz code 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 for channels > 14 from rtw_get_center_ch().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20200813065053.13883-1-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/core/rtw_wlan_util.c

index a3ea7ce..a5790a6 100644 (file)
@@ -374,20 +374,7 @@ u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset)
        u8 center_ch = channel;
 
        if (chnl_bw == CHANNEL_WIDTH_80) {
-               if ((channel == 36) || (channel == 40) || (channel == 44) || (channel == 48))
-                       center_ch = 42;
-               if ((channel == 52) || (channel == 56) || (channel == 60) || (channel == 64))
-                       center_ch = 58;
-               if ((channel == 100) || (channel == 104) || (channel == 108) || (channel == 112))
-                       center_ch = 106;
-               if ((channel == 116) || (channel == 120) || (channel == 124) || (channel == 128))
-                       center_ch = 122;
-               if ((channel == 132) || (channel == 136) || (channel == 140) || (channel == 144))
-                       center_ch = 138;
-               if ((channel == 149) || (channel == 153) || (channel == 157) || (channel == 161))
-                       center_ch = 155;
-               else if (channel <= 14)
-                       center_ch = 7;
+               center_ch = 7;
        } else if (chnl_bw == CHANNEL_WIDTH_40) {
                if (chnl_offset == HAL_PRIME_CHNL_OFFSET_LOWER)
                        center_ch = channel + 2;