Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 5857ad34cd5b114c4f98dab81d994b380a6a29e5 Author: Sven Eckelmann sven@narfation.org Date: Mon Apr 20 18:12:02 2015 +0200

batman-adv: Remove explicit compat.h include and split compat.h

The current approach for the compat layer is to include the compat.h file at exactly the right time to provide additional functionality and to live patch the batman-adv sources. This has the problem that the compat.h file becomes harder to read over time. Also live patching and adding of missing functionality partially conflict. This becomes obvious when the include order in some files is different compared to the one the author of an compat.h entry expected.

A different approach is to inject intermediate header files which add additional features. This allows to reduce the size of compat.h and only leaves the live patching part in it. The compat.h can then added automatically to each compile run before anything else is included. compat.h has therefore the control which headers must be included before the live patching of the batman-adv source can begin.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

Makefile | 4 + icmp_socket.h => compat-include/linux/atomic.h | 21 +- icmp_socket.h => compat-include/linux/bug.h | 28 +- icmp_socket.h => compat-include/linux/compiler.h | 30 +- compat-include/linux/etherdevice.h | 45 +++ icmp_socket.h => compat-include/linux/export.h | 21 +- icmp_socket.h => compat-include/linux/if_ether.h | 23 +- compat-include/linux/if_vlan.h | 44 +++ compat-include/linux/kconfig.h | 42 +++ compat-include/linux/kernel.h | 44 +++ compat-include/linux/list.h | 54 ++++ compat-include/linux/moduleparam.h | 72 +++++ icmp_socket.h => compat-include/linux/net.h | 29 +- .../linux/netdev_features.h | 25 +- compat-include/linux/netdevice.h | 120 +++++++ compat-include/linux/percpu.h | 48 +++ icmp_socket.h => compat-include/linux/printk.h | 29 +- icmp_socket.h => compat-include/linux/random.h | 23 +- compat-include/linux/rculist.h | 49 +++ icmp_socket.h => compat-include/linux/rcupdate.h | 29 +- icmp_socket.h => compat-include/linux/seq_file.h | 26 +- compat-include/linux/skbuff.h | 94 ++++++ icmp_socket.h => compat-include/linux/slab.h | 23 +- compat.h | 342 +------------------- main.h | 2 +- 25 files changed, 830 insertions(+), 437 deletions(-)

Diff suppressed because of size. To see it, use:

git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5857ad34cd5b114c4f98dab81d994b380a6a29e5