diff --git a/[refs] b/[refs]
index 09a734ba4fe4..823471bd087b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02233e0c75fc512ca60e7e82943f0a4395a85411
+refs/heads/master: 7cf4d520fdb72250b769920274279249629881ce
diff --git a/trunk/net/batman-adv/main.h b/trunk/net/batman-adv/main.h
index c4fe41f7c2f0..d04b209a8295 100644
--- a/trunk/net/batman-adv/main.h
+++ b/trunk/net/batman-adv/main.h
@@ -41,7 +41,7 @@
  * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE
  */
 #define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */
-#define BATADV_TT_LOCAL_TIMEOUT 3600000 /* in milliseconds */
+#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */
 #define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */
 #define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */
 #define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */