libertas_tf: fix signal reporting
diff mbox series

Message ID 20190210194822.18539-1-lkundrak@v3.sk
State Accepted
Commit b723dbb313f09d238738dae5efd6d7c52f0fe25e
Delegated to: Kalle Valo
Headers show
Series
  • libertas_tf: fix signal reporting
Related show

Commit Message

Lubomir Rintel Feb. 10, 2019, 7:48 p.m. UTC
Instead of exposing the signal-to-noise ration, calculate the actual signal
level taking the noise floor into account.

Also, flip the SIGNAL_DBM bit on, so that mac80211 exposes the signal
level along with the station info in scan results. This fills
NetworkManager's "nmcli d wifi output" output with colors, bars and joy.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
 drivers/net/wireless/marvell/libertas_tf/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Steve deRosier Feb. 11, 2019, 1:39 p.m. UTC | #1
On Sun, Feb 10, 2019 at 11:48 AM Lubomir Rintel <lkundrak@v3.sk> wrote:
>
> Instead of exposing the signal-to-noise ration, calculate the actual signal
> level taking the noise floor into account.
>
> Also, flip the SIGNAL_DBM bit on, so that mac80211 exposes the signal
> level along with the station info in scan results. This fills
> NetworkManager's "nmcli d wifi output" output with colors, bars and joy.
>
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> ---
>  drivers/net/wireless/marvell/libertas_tf/main.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c
> index c71ad87cdc44..f93b400db949 100644
> --- a/drivers/net/wireless/marvell/libertas_tf/main.c
> +++ b/drivers/net/wireless/marvell/libertas_tf/main.c
> @@ -562,7 +562,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
>                 stats.flag |= RX_FLAG_FAILED_FCS_CRC;
>         stats.freq = priv->cur_freq;
>         stats.band = NL80211_BAND_2GHZ;
> -       stats.signal = prxpd->snr;
> +       stats.signal = prxpd->snr - prxpd->nf;
>         priv->noise = prxpd->nf;
>         /* Marvell rate index has a hole at value 4 */
>         if (prxpd->rx_rate > 4)
> @@ -626,6 +626,7 @@ struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)
>
>         hw->queues = 1;
>         ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
> +       ieee80211_hw_set(hw, SIGNAL_DBM);
>         hw->extra_tx_headroom = sizeof(struct txpd);
>         memcpy(priv->channels, lbtf_channels, sizeof(lbtf_channels));
>         memcpy(priv->rates, lbtf_rates, sizeof(lbtf_rates));
> --
> 2.20.1
>

Reviewed-by: Steve deRosier <derosier@cal-sierra.com>
Kalle Valo Feb. 19, 2019, 3:12 p.m. UTC | #2
Lubomir Rintel <lkundrak@v3.sk> wrote:

> Instead of exposing the signal-to-noise ration, calculate the actual signal
> level taking the noise floor into account.
> 
> Also, flip the SIGNAL_DBM bit on, so that mac80211 exposes the signal
> level along with the station info in scan results. This fills
> NetworkManager's "nmcli d wifi output" output with colors, bars and joy.
> 
> Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
> Reviewed-by: Steve deRosier <derosier@cal-sierra.com>

Patch applied to wireless-drivers-next.git, thanks.

b723dbb313f0 libertas_tf: fix signal reporting

Patch
diff mbox series

diff --git a/drivers/net/wireless/marvell/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c
index c71ad87cdc44..f93b400db949 100644
--- a/drivers/net/wireless/marvell/libertas_tf/main.c
+++ b/drivers/net/wireless/marvell/libertas_tf/main.c
@@ -562,7 +562,7 @@  int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb)
 		stats.flag |= RX_FLAG_FAILED_FCS_CRC;
 	stats.freq = priv->cur_freq;
 	stats.band = NL80211_BAND_2GHZ;
-	stats.signal = prxpd->snr;
+	stats.signal = prxpd->snr - prxpd->nf;
 	priv->noise = prxpd->nf;
 	/* Marvell rate index has a hole at value 4 */
 	if (prxpd->rx_rate > 4)
@@ -626,6 +626,7 @@  struct lbtf_private *lbtf_add_card(void *card, struct device *dmdev)
 
 	hw->queues = 1;
 	ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
+	ieee80211_hw_set(hw, SIGNAL_DBM);
 	hw->extra_tx_headroom = sizeof(struct txpd);
 	memcpy(priv->channels, lbtf_channels, sizeof(lbtf_channels));
 	memcpy(priv->rates, lbtf_rates, sizeof(lbtf_rates));