From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 12 Oct 2011 21:18:14 +0000 (+0200)
Subject: Revert "b43: trivial: do not report any link quality instead of invalid one"
X-Git-Tag: v3.2-rc1~129^2~83^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b346f3eb4b59e00fbaca51637f2cf1df3f47f9d;p=users%2Fjedix%2Flinux-maple.git

Revert "b43: trivial: do not report any link quality instead of invalid one"

This reverts commit 55ad5962e97430c83d51df36fc18865ee4f78c48.

I assumed N is newer than LP, which isn't true. This regressed LP case.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 5f812d1d6d0e..b8de62c22479 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -735,13 +735,11 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 	}
 
 	/* Link quality statistics */
-	if ((chanstat & B43_RX_CHAN_PHYTYPE) >= B43_PHYTYPE_N) {
-		/*
-		s8 rssi = max(rxhdr->power0, rxhdr->power1);
-		TODO: Find out what the rssi value is (dBm or percentage?)
-		      and also find out what the maximum possible value is.
-		      Fill status.ssi and status.signal fields.
-		*/
+	if ((chanstat & B43_RX_CHAN_PHYTYPE) == B43_PHYTYPE_N) {
+//		s8 rssi = max(rxhdr->power0, rxhdr->power1);
+		//TODO: Find out what the rssi value is (dBm or percentage?)
+		//      and also find out what the maximum possible value is.
+		//      Fill status.ssi and status.signal fields.
 	} else {
 		status.signal = b43_rssi_postprocess(dev, rxhdr->jssi,
 						  (phystat0 & B43_RX_PHYST0_OFDM),