staging: brcm80211: changing interface to n-phy rssi compute function

The function wlc_phy_rssi_compute_nphy() was called with pointer to
brcms_d11rxhdr structure in which it filled in the received power
per antenna. However, these are not used further in the driver so
it only needs the d11rxhdr structure as input for rssi calculation.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index a26c682abc2c720727de13e07cff1381ae16f786..80252478c5f2d0aa6a0fac44f581f71e84ac663b 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h b/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
index b94117b006e0f52f55f5f06109cb21b1b81b2b6b..8ce01596b90e329614fdb7391412b867119f5b0a 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
index 58645d2b79d056ddccdae699594ff10d8dc21f1e..ff8b1d861f32e7896c30a5a22993fe7053f7e8df 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
+++ b/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)