summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-09-22 02:44:50 +0200
committerDavid S. Miller <davem@davemloft.net>2011-09-22 02:44:50 +0200
commitb7a17c0d846aab9f0e5d1dd3d005152c4ce459aa (patch)
tree0edaae4e84b8f98ea98316581d61f6dc73ce6bba /Documentation/networking
parentcan/sja1000: driver for PEAK PCAN PCI/PCIe cards (diff)
parentmacmace, macsonic: cleanup (diff)
downloadlinux-b7a17c0d846aab9f0e5d1dd3d005152c4ce459aa.tar.xz
linux-b7a17c0d846aab9f0e5d1dd3d005152c4ce459aa.zip
Merge branch 'master' of github.com:davem330/net-next
Diffstat (limited to 'Documentation/networking')
-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 88d4afbdef98..c86d03f18a5b 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: