From 399305bd71f34440b031a7ee074cbbda88f7c49c Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 29 Sep 2011 15:34:29 -0700
Subject: [PATCH] --- yaml --- r: 268622 b: refs/heads/master c:
 d6cf28b310b497b001af755d88394df005dc7b5a h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c   | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e671ee072bc4..6595e8983765 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e429e0b7f4f378333b752cd83a1bd5b7b2e22f63
+refs/heads/master: d6cf28b310b497b001af755d88394df005dc7b5a
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index a26c682abc2c..80252478c5f2 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -2646,7 +2646,7 @@ void wlc_phy_rssi_compute(struct brcms_phy_pub *pih,
 			rssi -= 256;
 	} else if (radioid == BCM2055_ID || radioid == BCM2056_ID
 		   || radioid == BCM2057_ID) {
-		rssi = wlc_phy_rssi_compute_nphy(pi, wlc_rxhdr);
+		rssi = wlc_phy_rssi_compute_nphy(pi, rxh);
 	}
 
 end:
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
index b94117b006e0..8ce01596b90e 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
@@ -1183,7 +1183,7 @@ extern void wlc_phy_est_tonepwr_nphy(struct brcms_phy *pi, s32 *qdBm_pwrbuf,
 extern void wlc_phy_radio205x_vcocal_nphy(struct brcms_phy *pi);
 
 extern int wlc_phy_rssi_compute_nphy(struct brcms_phy *pi,
-				     struct brcms_d11rxhdr *wlc_rxh);
+				     struct d11rxhdr *rxh);
 
 #define NPHY_TESTPATTERN_BPHY_EVM   0
 #define NPHY_TESTPATTERN_BPHY_RFCS  1
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
index 58645d2b79d0..ff8b1d861f32 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
@@ -23109,9 +23109,8 @@ void wlc_phy_rssi_cal_nphy(struct brcms_phy *pi)
 }
 
 int
-wlc_phy_rssi_compute_nphy(struct brcms_phy *pi, struct brcms_d11rxhdr *wlc_rxh)
+wlc_phy_rssi_compute_nphy(struct brcms_phy *pi, struct d11rxhdr *rxh)
 {
-	struct d11rxhdr *rxh = &wlc_rxh->rxhdr;
 	s16 rxpwr, rxpwr0, rxpwr1;
 	s16 phyRx0_l, phyRx2_l;
 
@@ -23134,10 +23133,6 @@ wlc_phy_rssi_compute_nphy(struct brcms_phy *pi, struct brcms_d11rxhdr *wlc_rxh)
 		rxpwr1 = phyRx2_l;
 	}
 
-	wlc_rxh->rxpwr[0] = (s8) rxpwr0;
-	wlc_rxh->rxpwr[1] = (s8) rxpwr1;
-	wlc_rxh->do_rssi_ma = 0;
-
 	if (pi->sh->rssi_mode == RSSI_ANT_MERGE_MAX)
 		rxpwr = (rxpwr0 > rxpwr1) ? rxpwr0 : rxpwr1;
 	else if (pi->sh->rssi_mode == RSSI_ANT_MERGE_MIN)