Commit 5a87ae1d authored by Michael Straube's avatar Michael Straube Committed by Kalle Valo

rtlwifi: rtl8192de: use generic rtl_query_rxpwrpercentage

Function _rtl92d_query_rxpwrpercentage is identical to the generic
version rtl_query_rxpwrpercentage. Remove _rtl92d_query_rxpwrpercentage
and use the generic function.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b8a19dd6
...@@ -23,16 +23,6 @@ static u8 _rtl92de_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue) ...@@ -23,16 +23,6 @@ static u8 _rtl92de_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
return skb->priority; return skb->priority;
} }
static u8 _rtl92d_query_rxpwrpercentage(s8 antpower)
{
if ((antpower <= -100) || (antpower >= 20))
return 0;
else if (antpower >= 0)
return 100;
else
return 100 + antpower;
}
static long _rtl92de_translate_todbm(struct ieee80211_hw *hw, static long _rtl92de_translate_todbm(struct ieee80211_hw *hw,
u8 signal_strength_index) u8 signal_strength_index)
{ {
...@@ -141,7 +131,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, ...@@ -141,7 +131,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
break; break;
} }
} }
pwdb_all = _rtl92d_query_rxpwrpercentage(rx_pwr_all); pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
/* CCK gain is smaller than OFDM/MCS gain, */ /* CCK gain is smaller than OFDM/MCS gain, */
/* so we add gain diff by experiences, the val is 6 */ /* so we add gain diff by experiences, the val is 6 */
pwdb_all += 6; pwdb_all += 6;
...@@ -183,7 +173,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, ...@@ -183,7 +173,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw,
rf_rx_num++; rf_rx_num++;
rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2) rx_pwr[i] = ((p_drvinfo->gain_trsw[i] & 0x3f) * 2)
- 110; - 110;
rssi = _rtl92d_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);
...@@ -191,7 +181,7 @@ static void _rtl92de_query_rxphystatus(struct ieee80211_hw *hw, ...@@ -191,7 +181,7 @@ static void _rtl92de_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) - 106; rx_pwr_all = ((p_drvinfo->pwdb_all >> 1) & 0x7f) - 106;
pwdb_all = _rtl92d_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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment