[PATCH] libertas: remove adapter->rxpd_rate

No code uses the contents of this variable, so it can go.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index e91d819555ebb0ad6aa122d592c6aa7f3b0f3de1..7aec0d4e20f9f02340ca2af2058c31c7fbebcd3c 100644 (file)
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -60,7 +60,6 @@ void libertas_mac_event_disconnected(wlan_private * priv)
        memset(adapter->rawNF, 0x00, sizeof(adapter->rawNF));
        adapter->nextSNRNF = 0;
        adapter->numSNRNF = 0;
-       adapter->rxpd_rate = 0;
        lbs_deb_cmd("current SSID '%s', length %u\n",
                    escape_essid(adapter->curbssparams.ssid,
                                 adapter->curbssparams.ssid_len),

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 9e18f012333c0af499109dd9d5826b6a5f562e9a..850518e9cbcb93b9f8fadeaf828007bc88b86045 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -343,7 +343,6 @@ struct _wlan_adapter {
        u8 rawNF[DEFAULT_DATA_AVG_FACTOR];
        u16 nextSNRNF;
        u16 numSNRNF;
-       u16 rxpd_rate;
 
        u8 radioon;
        u32 preamble;

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 25d45c646d71ff7256d0caa3043b6b0fbdd68a12..2473931f8151ffaf1d59d970792e51cc1e859fff 100644 (file)
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -117,8 +117,6 @@ static void wlan_compute_rssi(wlan_private * priv, struct rxpd *p_rx_pd)
        adapter->NF[TYPE_RXPD][TYPE_NOAVG] = p_rx_pd->nf;
        wlan_save_rawSNRNF(priv, p_rx_pd);
 
-       adapter->rxpd_rate = p_rx_pd->rx_rate;
-
        adapter->SNR[TYPE_RXPD][TYPE_AVG] = wlan_getavgsnr(priv) * AVG_SCALE;
        adapter->NF[TYPE_RXPD][TYPE_AVG] = wlan_getavgnf(priv) * AVG_SCALE;
        lbs_deb_rx("after computing SNR: SNR-avg = %d, NF-avg = %d\n",