diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-30 21:25:08 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-30 21:25:08 +0100 |
| commit | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (patch) | |
| tree | 9b4478941c486d47a71bfce455b896c5dda7e811 /drivers/net/wireless/libertas_tf | |
| parent | mac80211: annotate sleeping driver ops (diff) | |
| parent | Revert "b43: Enforce DMA descriptor memory constraints" (diff) | |
| download | linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.tar.xz linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.zip | |
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) stats.band = IEEE80211_BAND_2GHZ; stats.signal = prxpd->snr; stats.noise = prxpd->nf; - stats.qual = prxpd->snr - prxpd->nf; /* Marvell rate index has a hole at value 4 */ if (prxpd->rx_rate > 4) --prxpd->rx_rate; |