diff --git a/[refs] b/[refs]
index 54a017a72bb4..be81c4f39805 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d005b1d042a1d5dcd8d898f26d8d9bb03f865284
+refs/heads/master: 872ba53395b2a8be08c3ea2d39e225e5b4a8cb40
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index af375da9df21..affe42f8484c 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/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)