Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge

git-mirror · Sep 21, 2011 · 0c07090 · 0c07090
2 parents f26cd41 + 320f422
commit 0c07090
Show file tree

Hide file tree

Showing 16 changed files with 1,281 additions and 1,275 deletions.
diff --git 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:

diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
@@ -19,8 +19,8 @@
 #
 
 obj-$(CONFIG_BATMAN_ADV) += batman-adv.o
-batman-adv-y += aggregation.o
 batman-adv-y += bat_debugfs.o
+batman-adv-y += bat_iv_ogm.o
 batman-adv-y += bat_sysfs.o
 batman-adv-y += bitarray.o
 batman-adv-y += gateway_client.o

diff --git a/net/batman-adv/aggregation.c b/net/batman-adv/aggregation.c