summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2008-06-04 13:59:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-09 15:51:26 -0400
commit872ba53395b2a8be08c3ea2d39e225e5b4a8cb40 (patch)
tree9442f5a8fd3154e95be7a3ff090e07e360024d54 /net
parentd005b1d042a1d5dcd8d898f26d8d9bb03f865284 (diff)
mac80211: decrease IBSS creation latency
Sufficient scans (at least 2 or 3) should have been done within 7 seconds to find an existing IBSS to join. This should improve IBSS creation latency; and since IBSS merging is still in effect, shouldn't have detrimental effects on eventual IBSS convergence. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index af375da9df21..affe42f8484c 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -44,7 +44,7 @@
#define IEEE80211_RETRY_AUTH_INTERVAL (1 * HZ)
#define IEEE80211_SCAN_INTERVAL (2 * HZ)
#define IEEE80211_SCAN_INTERVAL_SLOW (15 * HZ)
-#define IEEE80211_IBSS_JOIN_TIMEOUT (20 * HZ)
+#define IEEE80211_IBSS_JOIN_TIMEOUT (7 * HZ)
#define IEEE80211_PROBE_DELAY (HZ / 33)
#define IEEE80211_CHANNEL_TIME (HZ / 33)