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

batman at open-mesh.org batman at open-mesh.org
Thu Sep 29 13:49:49 CEST 2011


The following commit has been merged in the master branch:
commit 5f30a4ab4ac40a71ce7e2aaaab782284553b21a4
Author: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
Date:   Sun Aug 21 15:19:08 2011 +0200

    batman-adv: update README (date & ap isolation sysfs file)
    
    Signed-off-by: Simon Wunderlich <siwu at hrz.tu-chemnitz.de>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 88d4afb..c86d03f 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -1,4 +1,4 @@
-[state: 17-04-2011]
+[state: 21-08-2011]
 
 BATMAN-ADV
 ----------
@@ -68,9 +68,9 @@ All  mesh  wide  settings  can be found in batman's own interface
 folder:
 
 #  ls  /sys/class/net/bat0/mesh/
-#  aggregated_ogms  gw_bandwidth  hop_penalty
-#  bonding          gw_mode       orig_interval
-#  fragmentation    gw_sel_class  vis_mode
+# aggregated_ogms   fragmentation gw_sel_class   vis_mode
+# ap_isolation      gw_bandwidth  hop_penalty
+# bonding           gw_mode       orig_interval
 
 
 There is a special folder for debugging information:

-- 
LinuxNextTracking


More information about the linux-merge mailing list