summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-09-21 15:25:47 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-21 15:25:47 -0400
commit0c070900f64ef37daf198eea5ef778eb8dba5020 (patch)
treeb31a54fff10f28333daeca0d86d74bb3201110e6 /Documentation
parentf26cd41ae56f3c0ef4521505ad5b6e3940849c33 (diff)
parent320f422f629c7ed5d07b4186aa491d1e11d18a4c (diff)
downloadlinux-3.10-0c070900f64ef37daf198eea5ef778eb8dba5020.tar.gz
linux-3.10-0c070900f64ef37daf198eea5ef778eb8dba5020.tar.bz2
linux-3.10-0c070900f64ef37daf198eea5ef778eb8dba5020.zip
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/batman-adv.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 88d4afbdef9..c86d03f18a5 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: