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

batman at open-mesh.org batman at open-mesh.org
Thu Mar 3 00:15:48 CET 2016

The following commit has been merged in the master branch:
commit 7f136cd491013285442ee1e7854fab1736f5757c
Author: Linus Luessing <linus.luessing at web.de>
Date:   Sat Jan 16 16:40:11 2016 +0800

    batman-adv: ELP - adding sysfs parameter for elp interval
    This parameter can be set individually on each interface and
    allows the configuration of the elp interval for the link
    quality measurements during runtime. Usually it is desirable
    to set it to a higher (= slower) value on interfaces which
    have a more static characteristic (e.g. wired interfaces)
    or very dense neighbourhoods to reduce overhead.
    Developed by Linus during a 6 months trainee study period in
    Ascom (Switzerland) AG.
    Signed-off-by: Linus Luessing <linus.luessing at web.de>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    [antonio at open-mesh.com: respin on top of the latest master]
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>

diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv
index 7f34a95..aea78db 100644
--- a/Documentation/ABI/testing/sysfs-class-net-batman-adv
+++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv
@@ -1,4 +1,11 @@
+What:           /sys/class/net/<iface>/batman-adv/elp_interval
+Date:           Feb 2014
+Contact:        Linus L├╝ssing <linus.luessing at web.de>
+                Defines the interval in milliseconds in which batman
+                sends its probing packets for link quality measurements.
 What:           /sys/class/net/<iface>/batman-adv/iface_status
 Date:           May 2010
 Contact:        Marek Lindner <mareklindner at neomailbox.ch>
@@ -12,4 +19,3 @@ Description:
                 The /sys/class/net/<iface>/batman-adv/mesh_iface file
                 displays the batman mesh interface this <iface>
                 currently is associated with.
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index d3f69d5..e860143 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -920,10 +920,17 @@ static ssize_t batadv_show_iface_status(struct kobject *kobj,
 static BATADV_ATTR(mesh_iface, S_IRUGO | S_IWUSR, batadv_show_mesh_iface,
 static BATADV_ATTR(iface_status, S_IRUGO, batadv_show_iface_status, NULL);
+BATADV_ATTR_HIF_UINT(elp_interval, bat_v.elp_interval, S_IRUGO | S_IWUSR,
 static struct batadv_attribute *batadv_batman_attrs[] = {
+	&batadv_attr_elp_interval,


More information about the linux-merge mailing list