Commit d6cf28b3 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

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: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e429e0b7

drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

drivers/staging/brcm80211/brcmsmac/phy/phy_int.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/brcm80211/brcmsmac/phy/phy_n.c

+1 −6
Original line number Diff line number Diff line
@@ -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)



























































CRA Git | Maintained and supported by SUSTech CRA and CCSE