From 5d16114050fffd8245ac69aac048da41ff820cdb Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Thu, 2 Aug 2007 13:10:05 -0400
Subject: [PATCH] --- yaml --- r: 66479 b: refs/heads/master c:
 ae596ce2f77d1542fe44ea483bd0ca7f61baeccd h: refs/heads/master i:   66477:
 4234077d557be330207b8fb6a59e8bbefff4a0da   66475:
 df20f14b0803fb701b9a29d8171e551375952fbc   66471:
 dbbfa267426587f7cef5d6a451ab9a0b68b50191   66463:
 9429f901f052bb059e3498a39f0e85392c26a069 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/libertas/dev.h  | 1 -
 trunk/drivers/net/wireless/libertas/join.c | 2 +-
 trunk/drivers/net/wireless/libertas/main.c | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7ea3fb694942..8cf75e8a61de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56c4656e84d068ecc4da670799216e5b2aaee50e
+refs/heads/master: ae596ce2f77d1542fe44ea483bd0ca7f61baeccd
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h
index 0f383e3f6f06..693058ad0239 100644
--- a/trunk/drivers/net/wireless/libertas/dev.h
+++ b/trunk/drivers/net/wireless/libertas/dev.h
@@ -303,7 +303,6 @@ struct _wlan_adapter {
 
 	/** POWER MANAGEMENT AND PnP SUPPORT */
 	u8 surpriseremoved;
-	u16 atimwindow;
 
 	u16 psmode;		/* Wlan802_11PowermodeCAM=disable
 				   Wlan802_11PowermodeMAX_PSP=enable */
diff --git a/trunk/drivers/net/wireless/libertas/join.c b/trunk/drivers/net/wireless/libertas/join.c
index 08034917d4b5..0bded0c91495 100644
--- a/trunk/drivers/net/wireless/libertas/join.c
+++ b/trunk/drivers/net/wireless/libertas/join.c
@@ -518,7 +518,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 
 	adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
 	adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
-	adhs->ssparamset.ibssparamset.atimwindow = cpu_to_le16(adapter->atimwindow);
+	adhs->ssparamset.ibssparamset.atimwindow = 0;
 
 	/* set capability info */
 	tmpcap = WLAN_CAPABILITY_IBSS;
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index df06d40ffdea..d227e453f984 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -998,9 +998,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	wlan_adapter *adapter = priv->adapter;
 	int i;
 
-	/* ATIM params */
-	adapter->atimwindow = 0;
-
 	adapter->connect_status = LIBERTAS_DISCONNECTED;
 	memset(adapter->current_addr, 0xff, ETH_ALEN);