---

yaml --- r: 66483 b: refs/heads/master c: 2c85103 h: refs/heads/master i: 66481: fbcceed 66479: 5d16114 v: v3
git-mirror · Oct 10, 2007 · 47be7da · 47be7da
1 parent 9fc29db
commit 47be7da
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: 85c93e5189b7402b4f9f4324c284bb91e8e8fb85
+refs/heads/master: 2c85103da3c88a06a7c01eece709482d85eff07f
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/drivers/net/wireless/libertas/dev.h
@@ -265,7 +265,6 @@ struct _wlan_adapter {
 	u8 scantype;
 	u32 scanmode;
 
-	u16 beaconperiod;
 	u8 adhoccreate;
 
 	/** capability Info used in Association, start, join */

diff --git a/trunk/drivers/net/wireless/libertas/join.c b/trunk/drivers/net/wireless/libertas/join.c
@@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 	/* set the BSS type */
 	adhs->bsstype = CMD_BSS_TYPE_IBSS;
 	adapter->mode = IW_MODE_ADHOC;
-	adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod);
+	adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);
 
 	/* set Physical param set */
 #define DS_PARA_IE_ID   3

diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
@@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	adapter->auto_rate = 1;
 	adapter->cur_rate = 0;
 
-	adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
-
 	// set default capabilities
 	adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;