Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <d1ae6de53236629d2d02bed1af280e1cbf4c4e8c.camel@perches.com>
Subject: Re: [PATCH 2/7] rtl8xxxu: add handle for mac80211 get_txpower
From:   Joe Perches <joe@perches.com>
To:     Reto Schneider <code@reto-schneider.ch>, Jes.Sorensen@gmail.com,
        linux-wireless@vger.kernel.org, pkshih@realtek.com
Cc:     yhchuang@realtek.com, Larry.Finger@lwfinger.net,
        tehuang@realtek.com, reto.schneider@husqvarnagroup.com,
        ccchiu77@gmail.com, kvalo@codeaurora.org, davem@davemloft.net,
        kuba@kernel.org, Chris Chiu <chiu@endlessos.org>,
        linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Date:   Thu, 13 May 2021 21:22:09 -0700
In-Reply-To: <20210514020442.946-3-code@reto-schneider.ch>
References: <a31d9500-73a3-f890-bebd-d0a4014f87da@reto-schneider.ch>
         <20210514020442.946-1-code@reto-schneider.ch>
         <20210514020442.946-3-code@reto-schneider.ch>
Content-Type: text/plain; charset="ISO-8859-1"
User-Agent: Evolution 3.38.1-1 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Fri, 2021-05-14 at 04:04 +0200, Reto Schneider wrote:
> From: Chris Chiu <chiu@endlessos.org>
> 
> add .get_txpower handle for mac80211 operations for `iw` and `wext`
> tools to get the underlying tx power (max limit).
[]
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
[]

> +int
> +rtl8xxxu_gen1_get_tx_power(struct rtl8xxxu_priv *priv)
> +{
> +	u8 txpwr_level;
> +	int txpwr_dbm;
> +
> +	txpwr_level = priv->cur_cck_txpwridx;
> +	txpwr_dbm = rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_B,
> +						  txpwr_level);
> +	txpwr_level = priv->cur_ofdm24g_txpwridx +
> +		      priv->ofdm_tx_power_index_diff[1].a;
> +
> +	if (rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_G, txpwr_level)
> +	    > txpwr_dbm)
> +		txpwr_dbm = rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_G,
> +							  txpwr_level);

probably better to use a temporaries instead of multiple calls.

	foo = rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_G, txpwr_level);
	if (foo > txpwr_dbm)
		txpwr_dbm = foo;

> +	txpwr_level = priv->cur_ofdm24g_txpwridx;
> +	if (rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_N_24G,
> +					  txpwr_level) > txpwr_dbm)
> +		txpwr_dbm = rtl8xxxu_gen1_txpwridx_to_dbm(priv,
> +							  WIRELESS_MODE_N_24G,
> +							  txpwr_level);
> +
> +	return txpwr_dbm;

	foo = rtl8xxxu_gen1_txpwridx_to_dbm(priv, WIRELESS_MODE_N_24G, txpwr_level);

	return min(txpwr_dbm, foo);