diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
| commit | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (patch) | |
| tree | 9b4478941c486d47a71bfce455b896c5dda7e811 /drivers/net/wireless/libertas_tf | |
| parent | e1781ed33a8809c58ad6c3b6d432d656446efa43 (diff) | |
| parent | 55afc80b2ab100618c17af77915f75307b6bd5d1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/libertas/scan.c
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 15a367680f59..ba3eb0101d55 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
| @@ -495,7 +495,6 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb) | |||
| 495 | stats.band = IEEE80211_BAND_2GHZ; | 495 | stats.band = IEEE80211_BAND_2GHZ; |
| 496 | stats.signal = prxpd->snr; | 496 | stats.signal = prxpd->snr; |
| 497 | stats.noise = prxpd->nf; | 497 | stats.noise = prxpd->nf; |
| 498 | stats.qual = prxpd->snr - prxpd->nf; | ||
| 499 | /* Marvell rate index has a hole at value 4 */ | 498 | /* Marvell rate index has a hole at value 4 */ |
| 500 | if (prxpd->rx_rate > 4) | 499 | if (prxpd->rx_rate > 4) |
| 501 | --prxpd->rx_rate; | 500 | --prxpd->rx_rate; |