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

batman at open-mesh.org batman at open-mesh.org
Wed Nov 9 00:15:55 CET 2016

The following commit has been merged in the master branch:
commit 1ed0359f1556e4c57778933f1e1104ca2cff4994
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jul 16 21:30:22 2016 +0200

    batman-adv: Add network_coding and mcast sysfs files to README
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index d414e60..8afa991 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -71,10 +71,11 @@ All  mesh  wide  settings  can be found in batman's own interface
 # ls /sys/class/net/bat0/mesh/
-#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
+# aggregated_ogms        fragmentation  isolation_mark  routing_algo
+# ap_isolation           gw_bandwidth   log_level       vlan0
+# bonding                gw_mode        multicast_mode
+# bridge_loop_avoidance  gw_sel_class   network_coding
+# distributed_arp_table  hop_penalty    orig_interval
 There is a special folder for debugging information:


More information about the linux-merge mailing list