batman-adv: agglomerate all batman iv ogm sending functions in the ba…

…tman iv file In the process the batman iv OGM aggregation code could be merged into the batman iv code base which makes the separate aggregation files superfluous. Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
git-mirror · Sep 8, 2011 · b9dacc5 · b9dacc5
1 parent d0b9fd8
commit b9dacc5
Show file tree

Hide file tree

Showing 8 changed files with 522 additions and 599 deletions.
diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile
@@ -19,7 +19,6 @@
 #
 
 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

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