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

batman at open-mesh.org batman at open-mesh.org
Thu Dec 15 00:16:48 CET 2011

The following commit has been merged in the master branch:
commit 1a98489731b0a02ed5c0f842651462050a3af001
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Tue Aug 30 13:32:33 2011 +0200

    batman-adv: readme update (mention ap isolation and new log level)
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index c86d03f..221ad0c 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -200,15 +200,16 @@ abled  during run time. Following log_levels are defined:
 0 - All  debug  output  disabled
 1 - Enable messages related to routing / flooding / broadcasting
-2 - Enable route or tt entry added / changed / deleted
-3 - Enable all messages
+2 - Enable messages related to route added / changed / deleted
+4 - Enable messages related to translation table operations
+7 - Enable all messages
 The debug output can be changed at runtime  using  the  file
 /sys/class/net/bat0/mesh/log_level. e.g.
 # echo 2 > /sys/class/net/bat0/mesh/log_level
-will enable debug messages for when routes or TTs change.
+will enable debug messages for when routes change.


More information about the linux-merge mailing list