Commit d01b2673 authored by Michael Straube's avatar Michael Straube Committed by Kalle Valo
Browse files

rtlwifi: rtl8192ce: use generic rtl_signal_scale_mapping 



Function _rtl92ce_signal_scale_mapping is identical to the generic
version rtl_signal_scale_mapping. Remove _rtl92ce_signal_scale_mapping
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 5a87ae1d

drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c

+2 −32
Original line number Diff line number Diff line
@@ -23,35 +23,6 @@ static u8 _rtl92ce_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue) 
	return skb->priority;

}



static long _rtl92ce_signal_scale_mapping(struct ieee80211_hw *hw,

		long currsig)

{

	long retsig;



	if (currsig >= 61 && currsig <= 100)

		retsig = 90 + ((currsig - 60) / 4);

	else if (currsig >= 41 && currsig <= 60)

		retsig = 78 + ((currsig - 40) / 2);

	else if (currsig >= 31 && currsig <= 40)

		retsig = 66 + (currsig - 30);

	else if (currsig >= 21 && currsig <= 30)

		retsig = 54 + (currsig - 20);

	else if (currsig >= 5 && currsig <= 20)

		retsig = 42 + (((currsig - 5) * 2) / 3);

	else if (currsig == 4)

		retsig = 36;

	else if (currsig == 3)

		retsig = 27;

	else if (currsig == 2)

		retsig = 18;

	else if (currsig == 1)

		retsig = 9;

	else

		retsig = currsig;



	return retsig;

}



static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,

				       struct rtl_stats *pstats,

				       struct rx_desc_92c *pdesc,
@@ -231,11 +202,10 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw, 
	 */

	if (is_cck_rate)

		pstats->signalstrength =

		    (u8)(_rtl92ce_signal_scale_mapping(hw, pwdb_all));

		    (u8)(rtl_signal_scale_mapping(hw, pwdb_all));

	else if (rf_rx_num != 0)

		pstats->signalstrength =

		    (u8)(_rtl92ce_signal_scale_mapping

			  (hw, total_rssi /= rf_rx_num));

		    (u8)(rtl_signal_scale_mapping(hw, total_rssi /= rf_rx_num));

}



static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw,

CRA Git | Maintained and supported by SUSTech CRA and CCSE