[PATCH] libertas: remove adapter->listeninterval

listeninterval was initialized with MRVDRV_DEFAULT_LISTEN_INTERVAL, but
there exists that would ever change it. So we can use this define directly.

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/dev.h b/drivers/net/wireless/libertas/dev.h
index 16e7ec11425bcec0faba9733988dc44f29c00c99..4738afa61e3314a8c1f235215426d198aa4660b9 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -287,7 +287,6 @@ struct _wlan_adapter {
        u32 fragthsd;
        u32 rtsthsd;
 
-       u16 listeninterval;
        u8 txretrycount;
 
        /** Tx-related variables (for single packet tx) */

diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 0bded0c91495075e6eb225619fddc132e1d7e02b..e335a7e4adaa79fb43923319f962261f6e30b65e 100644 (file)
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -369,7 +369,7 @@ int libertas_cmd_80211_associate(wlan_private * priv,
        pos += sizeof(passo->peerstaaddr);
 
        /* set the listen interval */
-       passo->listeninterval = cpu_to_le16(adapter->listeninterval);
+       passo->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);
 
        pos += sizeof(passo->capability);
        pos += sizeof(passo->listeninterval);

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index d227e453f9843fc641bbf94e931832fdd866d893..d3316e413465b43367e61cd572d46c64f34b5831 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1051,8 +1051,6 @@ static void wlan_init_adapter(wlan_private * priv)
 
        adapter->psmode = WLAN802_11POWERMODECAM;
 
-       adapter->listeninterval = MRVDRV_DEFAULT_LISTEN_INTERVAL;
-
        adapter->psstate = PS_STATE_FULL_POWER;
        adapter->needtowakeup = 0;