The following commit has been merged in the master branch: commit 8444f4c1e118c6b3e3f272e5e0bb629a2ae53dda Author: Antonio Quartulli ordex@autistici.org Date: Mon Feb 27 13:17:39 2012 +0100

batctl: update README and man with bla loglevel information

Both the README and the man page have to report the new loglevel information in the corresponding section

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/README b/README index da0ac68..64ee152 100644 --- a/README +++ b/README @@ -300,6 +300,7 @@ $ batctl loglevel [ ] messages related to routing / flooding / broadcasting (batman) [ ] messages related to route added / changed / deleted (routes) [ ] messages related to translation table operations (tt) +[ ] messages related to bridge loop avoidance (bla)

batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index f45a070..5cc37cb 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -65,7 +65,7 @@ Once started batctl will display the list of announced gateways in the network. If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" -If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. +If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "-n" is given batctl will not replace the MAC addresses with bat-host names in the output.