The following commit has been merged in the master branch: commit 052332fb1a2d694fdc10bb0ebef495bbcb6fb06d Author: Marek Lindner lindner_marek@yahoo.de Date: Thu Feb 9 16:10:12 2012 +0800

batman-adv: compat layer also needs ifdefs for bridge loop avoidance

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/compat.c b/compat.c index 73a2d8b..35ad397 100644 --- a/compat.c +++ b/compat.c @@ -55,6 +55,7 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu) kfree(tt_local_entry); }

+#ifdef CONFIG_BATMAN_ADV_BLA void free_rcu_backbone_gw(struct rcu_head *rcu) { struct backbone_gw *backbone_gw; @@ -62,5 +63,6 @@ void free_rcu_backbone_gw(struct rcu_head *rcu) backbone_gw = container_of(rcu, struct backbone_gw, rcu); kfree(backbone_gw); } +#endif

#endif /* < KERNEL_VERSION(3, 0, 0) */