aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas')
-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.c3
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 0f383e3f6f06..693058ad0239 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -303,7 +303,6 @@ struct _wlan_adapter {
303 303
304 /** POWER MANAGEMENT AND PnP SUPPORT */ 304 /** POWER MANAGEMENT AND PnP SUPPORT */
305 u8 surpriseremoved; 305 u8 surpriseremoved;
306 u16 atimwindow;
307 306
308 u16 psmode; /* Wlan802_11PowermodeCAM=disable 307 u16 psmode; /* Wlan802_11PowermodeCAM=disable
309 Wlan802_11PowermodeMAX_PSP=enable */ 308 Wlan802_11PowermodeMAX_PSP=enable */
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 08034917d4b5..0bded0c91495 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -518,7 +518,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
518 518
519 adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID; 519 adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
520 adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN; 520 adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
521 adhs->ssparamset.ibssparamset.atimwindow = cpu_to_le16(adapter->atimwindow); 521 adhs->ssparamset.ibssparamset.atimwindow = 0;
522 522
523 /* set capability info */ 523 /* set capability info */
524 tmpcap = WLAN_CAPABILITY_IBSS; 524 tmpcap = WLAN_CAPABILITY_IBSS;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index df06d40ffdea..d227e453f984 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -998,9 +998,6 @@ static void wlan_init_adapter(wlan_private * priv)
998 wlan_adapter *adapter = priv->adapter; 998 wlan_adapter *adapter = priv->adapter;
999 int i; 999 int i;
1000 1000
1001 /* ATIM params */
1002 adapter->atimwindow = 0;
1003
1004 adapter->connect_status = LIBERTAS_DISCONNECTED; 1001 adapter->connect_status = LIBERTAS_DISCONNECTED;
1005 memset(adapter->current_addr, 0xff, ETH_ALEN); 1002 memset(adapter->current_addr, 0xff, ETH_ALEN);
1006 1003