[linux-next] LinuxNextTracking branch, master, updated. next-20130115

batman at open-mesh.org batman at open-mesh.org
Wed Jan 16 00:20:27 CET 2013


The following commit has been merged in the master branch:
commit 7cf4d520fdb72250b769920274279249629881ce
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Thu Nov 8 22:16:15 2012 +0100

    batman-adv: reduce local TT entry timeout to 10 minutes
    
    The current timeout is set to one hour. However a client connected to the mesh
    network will always generate traffic. In the worst case it will send ARP
    requests every 4 or 5 minutes. On the other hand having a long timeout means
    storing dead entries for one hour and it leads to very big trans-tables
    containing useless clients.
    
    This patch reduces the timeout to 10 minutes
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index c4fe41f..d04b209 100644
--- a/net/batman-adv/main.h
+++ b/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 */

-- 
LinuxNextTracking


More information about the linux-merge mailing list