---

yaml --- r: 66481 b: refs/heads/master c: 0aabc0a h: refs/heads/master i: 66479: 5d16114 v: v3
git-mirror · Oct 10, 2007 · fbcceed · fbcceed
1 parent f873545
commit fbcceed
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 956deb867a97ac137c164a5d2d12b0c82fb6776d
+refs/heads/master: 0aabc0a5d5657df254255c9049a97cc96229bcba
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/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/trunk/drivers/net/wireless/libertas/join.c b/trunk/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/trunk/drivers/net/wireless/libertas/main.c b/trunk/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;