The following commit has been merged in the master branch: commit 21c02be7cfc5c6b7927290716a243674f134242b Author: Marek Lindner mareklindner@neomailbox.ch Date: Mon May 9 18:42:12 2016 +0800

batman-adv: update elp interval documentation

Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Acked-by: Antonio Quartulli a@unstable.cc Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/Documentation/ABI/testing/sysfs-class-net-batman-adv b/Documentation/ABI/testing/sysfs-class-net-batman-adv index 77d3083..8981068 100644 --- a/Documentation/ABI/testing/sysfs-class-net-batman-adv +++ b/Documentation/ABI/testing/sysfs-class-net-batman-adv @@ -4,7 +4,7 @@ Date: Feb 2014 Contact: Linus Lüssing linus.luessing@web.de Description: Defines the interval in milliseconds in which batman - sends its probing packets for link quality measurements. + emits probing packets for neighbor sensing (ELP).

What: /sys/class/net/<iface>/batman-adv/iface_status Date: May 2010