The following commit has been merged in the master branch: commit a77e8c61dbe9c6abb7072c02f41271a489370f0c Author: Sven Eckelmann sven@narfation.org Date: Mon Apr 2 19:31:26 2012 +0200

batman-adv: README cleanups

- Add routing_algo

- Remove date from README: The date has to be updated when a patch touches the README. Therefore, nearly every feature will modify this date. It can happens quite often that not only one feature is currently in development or waiting on the mailinglist. This creates merge conflicts when applying a patchset.

The date itself doesn't provide any additional information when this file is only available in a release tarball or as part of a SCM repository.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 220a58c..75a5923 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -1,5 +1,3 @@ -[state: 21-08-2011] - BATMAN-ADV ----------

@@ -68,10 +66,11 @@ All mesh wide settings can be found in batman's own interface folder:

# ls /sys/class/net/bat0/mesh/ -# aggregated_ogms fragmentation hop_penalty -# ap_isolation gw_bandwidth log_level -# bonding gw_mode orig_interval -# bridge_loop_avoidance gw_sel_class vis_mode +# aggregated_ogms gw_bandwidth log_level +# ap_isolation gw_mode orig_interval +# bonding gw_sel_class routing_algo +# bridge_loop_avoidance hop_penalty vis_mode +# fragmentation

There is a special folder for debugging information: