From 10244a0aed9bcfc43e5ca53faac45e24bafc773c Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Thu, 12 Jun 2008 22:38:37 +0300
Subject: [PATCH] --- yaml --- r: 102955 b: refs/heads/master c:
 dc0ae30c31ee6ef83992bb692f37dfbba08a2ef6 h: refs/heads/master i:   102953:
 9a6a307c18f31ba893a50fcc7982f5a0ff34dc9d   102951:
 16a35380e882629e228b383a5bad3b688cc2becd v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 3 ++-
 trunk/net/mac80211/mlme.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1433743ae429..712bc79dbec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5720508d9ad9a82927875252b7a19ba2b45f11f8
+refs/heads/master: dc0ae30c31ee6ef83992bb692f37dfbba08a2ef6
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index b182f018a187..5c5396edad32 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -1707,7 +1707,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
 	debugfs_hw_add(local);
 
-	local->hw.conf.beacon_int = 1000;
+	if (local->hw.conf.beacon_int < 10)
+		local->hw.conf.beacon_int = 100;
 
 	local->wstats_flags |= local->hw.flags & (IEEE80211_HW_SIGNAL_UNSPEC |
 						  IEEE80211_HW_SIGNAL_DB |
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 7f05820dc629..46f203740834 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -3583,7 +3583,7 @@ static int ieee80211_sta_create_ibss(struct net_device *dev,
 	sband = local->hw.wiphy->bands[bss->band];
 
 	if (local->hw.conf.beacon_int == 0)
-		local->hw.conf.beacon_int = 10000;
+		local->hw.conf.beacon_int = 100;
 	bss->beacon_int = local->hw.conf.beacon_int;
 	bss->last_update = jiffies;
 	bss->capability = WLAN_CAPABILITY_IBSS;