rtlwifi: rtl8192cu: use generic rtl_query_rxpwrpercentage (b8a19dd6) · Commits · 戴 / test

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c

+3 −13

Original line number	Diff line number	Diff line
		@@ -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,
		long currsig)
		{
		@@ -678,7 +668,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
		break;
		}
		}
		pwdb_all = _rtl92c_query_rxpwrpercentage(rx_pwr_all);
		pwdb_all = rtl_query_rxpwrpercentage(rx_pwr_all);
		pstats->rx_pwdb_all = pwdb_all;
		pstats->recvsignalpower = rx_pwr_all;
		if (packet_match_bssid) {
		@@ -707,7 +697,7 @@ static void _rtl92c_query_rxphystatus(struct ieee80211_hw *hw,
		rf_rx_num++;
		rx_pwr[i] =
		((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;
		rtlpriv->stats.rx_snr_db[i] =
		(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;
		}
		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->rxpower = rx_pwr_all;
		pstats->recvsignalpower = rx_pwr_all;