UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtlwifi: rtl8192cu: use generic rtl_query_rxpwrpercentage 

Function _rtl92c_query_rxpwrpercentage is identical to the generic
version rtl_query_rxpwrpercentage. Remove _rtl92c_query_rxpwrpercentage
and use the generic function.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Michael Straube 2019-12-11 16:47:51 +01:00 committed by Kalle Valo
parent f365f2f67b
commit b8a19dd645
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c
View File

@ -567,16 +567,6 @@ void rtl92c_set_min_space(struct ieee80211_hw *hw, bool is2T)
/*==============================================================*/ /*==============================================================*/
static u8 _rtl92c_query_rxpwrpercentage(s8 antpower)
{
if ((antpower <= -100) || (antpower >= 20))
return 0;
else if (antpower >= 0)
return 100;
else
return 100 + antpower;
}
static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw, static long _rtl92c_signal_scale_mapping(struct ieee80211_hw *hw,
long currsig) long currsig)
{ {
@ -678,7 +668,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
break; break;
} }
} }
pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all); pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
pstats->rx_pwdb_all = pwdb_all; pstats->rx_pwdb_all = pwdb_all;
pstats->recvsignalpower = rx_pwr_all; pstats->recvsignalpower = rx_pwr_all;
if (packet_match_bssid) { if (packet_match_bssid) {
@ -707,7 +697,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
rf_rx_num++; rf_rx_num++;
rx_pwr[i] = rx_pwr[i] =
((p_drvinfo->gain_trsw[i] & 0x3f) * 2) - 110; ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) - 110;
rssi = _rtl92c_query_rxpwrpercentage(rx_pwr[i]); rssi = rtl_query_rxpwrpercentage(rx_pwr[i]);
total_rssi += rssi; total_rssi += rssi;
rtlpriv->stats.rx_snr_db[i] = rtlpriv->stats.rx_snr_db[i] =
(long)(p_drvinfo->rxsnr[i] / 2); (long)(p_drvinfo->rxsnr[i] / 2);
@ -716,7 +706,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
pstats->rx_mimo_signalstrength[i] = (u8) rssi; pstats->rx_mimo_signalstrength[i] = (u8) rssi;
} }
rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110; rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 110;
pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all); pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
pstats->rx_pwdb_all = pwdb_all; pstats->rx_pwdb_all = pwdb_all;
pstats->rxpower = rx_pwr_all; pstats->rxpower = rx_pwr_all;
pstats->recvsignalpower = rx_pwr_all; pstats->recvsignalpower = rx_pwr_all;