---

yaml --- r: 66479 b: refs/heads/master c: ae596ce h: refs/heads/master i: 66477: 4234077 66475: df20f14 66471: dbbfa26 66463: 9429f90 v: v3
git-mirror · Oct 10, 2007 · 5d16114 · 5d16114
1 parent 30136c4
commit 5d16114
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);