staging: r8188eu: clean up rtw_rf.c
v2 cover staging: r8188eu: clean up rtw_rf.c
This set removes 5 GHz frequencies from the channel-frequency map in rtw_rf.c and simplifies the rtw_ch2freq() function.
Tested on x86_64 with Inter-Tech DMG-02.
v2:
Changed the commit message of patch 1/3.
Added a check to avoid out of bounds array access in patch 2/3.
Michael Straube (3):
staging: r8188eu: remove 5 GHz channels from ch_freq_map
staging: r8188eu: refactor rtw_ch2freq()
staging: r8188eu: clean up rtw_rf.c
drivers/staging/r8188eu/core/rtw_rf.c | 62 ++++++++------------------- 1 file changed, 18 insertions(+), 44 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 1/3 staging: r8188eu: remove 5 GHz channels from ch_freq_map
According to the Realtek documentation the chips this driver supports are 2.4 GHz only chips. Frequencies for 5 GHz channels can be removed from the ch_freq_map array.
---
v2:
Changed the commit message.
drivers/staging/r8188eu/core/rtw_rf.c | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/r8188eu/core/rtw_rf.c +0 -16
@@ -17,22 +17,6 @@ static struct ch_freq ch_freq_map[] = { {1, 2412}, {2, 2417}, {3, 2422}, {4, 2427}, {5, 2432}, {6, 2437}, {7, 2442}, {8, 2447}, {9, 2452}, {10, 2457}, {11, 2462}, {12, 2467}, {13, 2472}, {14, 2484}, -/* UNII */ - {36, 5180}, {40, 5200}, {44, 5220}, {48, 5240}, {52, 5260}, - {56, 5280}, {60, 5300}, {64, 5320}, {149, 5745}, {153, 5765}, - {157, 5785}, {161, 5805}, {165, 5825}, {167, 5835}, {169, 5845}, - {171, 5855}, {173, 5865}, -/* HiperLAN2 */ - {100, 5500}, {104, 5520}, {108, 5540}, {112, 5560}, {116, 5580}, - {120, 5600}, {124, 5620}, {128, 5640}, {132, 5660}, {136, 5680}, - {140, 5700}, -/* Japan MMAC */ - {34, 5170}, {38, 5190}, {42, 5210}, {46, 5230}, -/* Japan */ - {184, 4920}, {188, 4940}, {192, 4960}, {196, 4980}, - {208, 5040},/* Japan, means J08 */ - {212, 5060},/* Japan, means J12 */ - {216, 5080},/* Japan, means J16 */ };static int ch_freq_map_num =ARRAY_SIZE (ch_freq_map);
Signature · 1 line
2.35.1
PATCH v2 2/3 staging: r8188eu: refactor rtw_ch2freq()
In reply to Michael StraubeConvert the array ch_freq_map to a simple integer array and use the indices as channel numbers. This simplifies the code and avoids looping through the array to get the frequency. To avoid out of bounds array access return a default value for invalid channel values, like the original code did.
---
v2:
Added a check to avoid out of bounds array access.
drivers/staging/r8188eu/core/rtw_rf.c | 41 ++++++++++++--------------- 1 file changed, 18 insertions(+), 23 deletions(-)
drivers/staging/r8188eu/core/rtw_rf.c +18 -23
@@ -8,32 +8,27 @@#include "../include/recv_osdep.h" #include "../include/xmit_osdep.h" -struct ch_freq { -u32 channel; -u32 frequency; +static const u32 ch_freq_map[] = { +2412 , +2417 , +2422 , +2427 , +2432 , +2437 , +2442 , +2447 , +2452 , +2457 , +2462 , +2467 , +2472 , +2484 }; -static struct ch_freq ch_freq_map[] = { - {1 ,2412 }, {2 ,2417 }, {3 ,2422 }, {4 ,2427 }, {5 ,2432 }, - {6 ,2437 }, {7 ,2442 }, {8 ,2447 }, {9 ,2452 }, {10 ,2457 }, - {11 ,2462 }, {12 ,2467 }, {13 ,2472 }, {14 ,2484 }, -}; - -static int ch_freq_map_num =ARRAY_SIZE (ch_freq_map); -u32 rtw_ch2freq (u32 channel) { -u8 i; -u32 freq =0 ; - -for (i =0 ; i < ch_freq_map_num; i++) { -if (channel == ch_freq_map[i].channel) { - freq = ch_freq_map[i].frequency; -break ; - } - } -if (i == ch_freq_map_num) - freq =2412 ; +if (channel ==0 || channel >ARRAY_SIZE (ch_freq_map)) +return 2412 ; -return freq; +return ch_freq_map[channel -1 ]; }
Signature · 1 line
2.35.1
PATCH v2 3/3 staging: r8188eu: clean up rtw_rf.c
In reply to Michael StraubeRemove unnecessary includes and the unused define _RTW_RF_C_ from rtw_rf.c.
---
v2:
No changes.
drivers/staging/r8188eu/core/rtw_rf.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/r8188eu/core/rtw_rf.c +0 -5
@@ -1,12 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ -#define _RTW_RF_C_ - -#include "../include/osdep_service.h" #include "../include/drv_types.h" -#include "../include/recv_osdep.h" -#include "../include/xmit_osdep.h" static const u32 ch_freq_map[] = {2412 ,
Signature · 1 line
2.35.1