summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:10:59 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:50:05 -0700
commit0aabc0a5d5657df254255c9049a97cc96229bcba (patch)
tree8015e46338c431168fa7da33394041f52ad445f8 /drivers/net/wireless
parent956deb867a97ac137c164a5d2d12b0c82fb6776d (diff)
downloadop-kernel-dev-0aabc0a5d5657df254255c9049a97cc96229bcba.zip
op-kernel-dev-0aabc0a5d5657df254255c9049a97cc96229bcba.tar.gz
[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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/join.c2
-rw-r--r--drivers/net/wireless/libertas/main.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 16e7ec1..4738afa 100644
--- 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 0bded0c..e335a7e 100644
--- 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 d227e45..d3316e4 100644
--- 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;
OpenPOWER on IntegriCloud