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

batman at open-mesh.org batman at open-mesh.org
Thu Jan 16 00:19:58 CET 2014

The following commit has been merged in the master branch:
commit c28c0b6b14e09e2c2a9ef328bc44ddb75020d9d1
Author: Antonio Quartulli <antonio at meshcoding.com>
Date:   Tue Nov 19 08:36:29 2013 +0100

    batman-adv: add missing sysfs attributes to README
    Add missing sysfs attributes in the proper section of the README
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 89490beb..58e4904 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -66,11 +66,10 @@ All  mesh  wide  settings  can be found in batman's own interface
 # ls /sys/class/net/bat0/mesh/
-# aggregated_ogms        gw_bandwidth           log_level
-# ap_isolation           gw_mode                orig_interval
-# bonding                gw_sel_class           routing_algo
-# bridge_loop_avoidance  hop_penalty            fragmentation
+#aggregated_ogms        distributed_arp_table  gw_sel_class    orig_interval
+#ap_isolation           fragmentation          hop_penalty     routing_algo
+#bonding                gw_bandwidth           isolation_mark  vlan0
+#bridge_loop_avoidance  gw_mode                log_level
 There is a special folder for debugging information:


More information about the linux-merge mailing list