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

batman at open-mesh.org batman at open-mesh.org
Fri Aug 8 00:21:09 CEST 2014


The following commit has been merged in the master branch:
commit e03366ea6b05c0ac7e53cecb292b6182419dc49c
Author: Simon Wunderlich <simon at open-mesh.com>
Date:   Tue Jun 17 12:16:03 2014 +0200

    batman-adv: increase default hop penalty
    
    The default hop penalty is currently set to 15, which is applied like
    that for multi interface devices (e.g. dual band APs). Single band
    devices will still use an effective penalty of 30 (hop penalty + wifi
    penalty).
    
    After receiving reports of too long paths in mesh networks with dual
    band APs which were fixed by increasing the hop penalty, we'd like to
    suggest to increase that default value in the default setting as well.
    We've evaluated that increase in a handful of medium sized mesh
    networks (5-20 nodes) with single and dual band devices, with changes
    for the better (shorter routes, higher throughput) or no change at all.
    
    This patch changes the hop penalty to 30, which will give an effective
    penalty of 60 on single band devices (hop penalty + wifi penalty).
    
    Signed-off-by: Simon Wunderlich <simon at open-mesh.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index e0a7239..5467955 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -751,7 +751,7 @@ static int batadv_softif_init_late(struct net_device *dev)
 	atomic_set(&bat_priv->gw.bandwidth_down, 100);
 	atomic_set(&bat_priv->gw.bandwidth_up, 20);
 	atomic_set(&bat_priv->orig_interval, 1000);
-	atomic_set(&bat_priv->hop_penalty, 15);
+	atomic_set(&bat_priv->hop_penalty, 30);
 #ifdef CONFIG_BATMAN_ADV_DEBUG
 	atomic_set(&bat_priv->log_level, 0);
 #endif

-- 
LinuxNextTracking


More information about the linux-merge mailing list