commits April 2015

commits@lists.open-mesh.org

1 participants
69 discussions

[batman-adv] master: Merge branch 'next' (620c91f)
by postmaster＠open-mesh.org 22 Apr '15

22 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 620c91f3debcfc4a55d6e53bc16e73da4e40971f Merge: 13f9fdd b492832 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Apr 22 10:12:06 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 620c91f3debcfc4a55d6e53bc16e73da4e40971f README.external | 1 + 1 file changed, 1 insertion(+)

1 0

[batman-adv] next: batman-adv: Document multicast compile time option (b492832)
by postmaster＠open-mesh.org 22 Apr '15

22 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit b492832c4e56c5fe6d545e3b1fa7e507b4e3e102 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Apr 21 14:48:56 2015 +0200 batman-adv: Document multicast compile time option The README.external lists all options which can be enabled/disabled during compile time. The CONFIG_BATMAN_ADV_MCAST option wasn't document in this list. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- b492832c4e56c5fe6d545e3b1fa7e507b4e3e102 README.external | 1 + 1 file changed, 1 insertion(+) diff --git a/README.external b/README.external index e3b533d..f068273 100644 --- a/README.external +++ b/README.external @@ -38,6 +38,7 @@ module). Available options and their possible values are * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) + * CONFIG_BATMAN_ADV_MCAST=[y*|n] (B.A.T.M.A.N. multicast optimizations) * CONFIG_BATMAN_ADV_NC=[y|n*] (B.A.T.M.A.N. Network Coding) e.g., debugging can be enabled by

1 0

[batctl] master: Merge branch 'next' (2fca825)
by postmaster＠open-mesh.org 22 Apr '15

22 Apr '15

1 0

[batctl] master's head updated: Merge branch 'next' (2fca825)
by postmaster＠open-mesh.org 22 Apr '15

22 Apr '15

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: ba4adf1 batctl: Update copyright years for 2015 2fca825 Merge branch 'next'

1 0

[batctl] next: batctl: Update copyright years for 2015 (ba4adf1)
by postmaster＠open-mesh.org 22 Apr '15

22 Apr '15

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit ba4adf15cdcd044371b4e050e8534f7243ee8346 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Feb 5 16:45:24 2015 +0100 batctl: Update copyright years for 2015 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ba4adf15cdcd044371b4e050e8534f7243ee8346 Makefile | 2 +- allocate.h | 2 +- bat-hosts.c | 2 +- bat-hosts.h | 2 +- bisect_iv.c | 2 +- bisect_iv.h | 2 +- debug.c | 2 +- debug.h | 2 +- functions.c | 2 +- functions.h | 2 +- hash.c | 2 +- hash.h | 2 +- ioctl.c | 2 +- ioctl.h | 2 +- list-batman.c | 2 +- list-batman.h | 2 +- main.c | 2 +- main.h | 2 +- ping.c | 2 +- ping.h | 2 +- sys.c | 2 +- sys.h | 2 +- tcpdump.c | 2 +- tcpdump.h | 2 +- traceroute.c | 2 +- traceroute.h | 2 +- translate.c | 2 +- translate.h | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index 0eb71a1..d83d2e8 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2006-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2006-2015 B.A.T.M.A.N. contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public diff --git a/allocate.h b/allocate.h index c2f7777..02edf5c 100644 --- a/allocate.h +++ b/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bat-hosts.c b/bat-hosts.c index 1d62bb8..72bec80 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bat-hosts.h b/bat-hosts.h index 327208b..f402455 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bisect_iv.c b/bisect_iv.c index fea6358..5b9c041 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/bisect_iv.h b/bisect_iv.h index a7ea706..ec575d2 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.c b/debug.c index dfcf3c3..a050345 100644 --- a/debug.c +++ b/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/debug.h b/debug.h index 76d5e68..2bc0ff9 100644 --- a/debug.h +++ b/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/functions.c b/functions.c index 251e616..3fcd2ad 100644 --- a/functions.c +++ b/functions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/functions.h b/functions.h index 43c3d9c..02ed5ea 100644 --- a/functions.h +++ b/functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/hash.c b/hash.c index 14debcb..069a424 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index c9c8fb1..aa27f25 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/ioctl.c b/ioctl.c index d3d182f..068f894 100644 --- a/ioctl.c +++ b/ioctl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ioctl.h b/ioctl.h index d47ad08..55c9aab 100644 --- a/ioctl.h +++ b/ioctl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/list-batman.c b/list-batman.c index b31a324..1beafaf 100644 --- a/list-batman.c +++ b/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/list-batman.h b/list-batman.h index 0ee1367..c7372c8 100644 --- a/list-batman.h +++ b/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index 44cf49b..d127cdc 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/main.h b/main.h index 461f3e3..d96ce94 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ping.c b/ping.c index bdca222..d080aa4 100644 --- a/ping.c +++ b/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/ping.h b/ping.h index 6258534..a6c1e36 100644 --- a/ping.h +++ b/ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.c b/sys.c index 0d7f55f..81b8faf 100644 --- a/sys.c +++ b/sys.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/sys.h b/sys.h index 3859253..9addd90 100644 --- a/sys.h +++ b/sys.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/tcpdump.c b/tcpdump.c index b994977..0bbfefc 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de> * diff --git a/tcpdump.h b/tcpdump.h index 5d936f2..e0172f7 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/traceroute.c b/traceroute.c index 4ebfec2..cedce80 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/traceroute.h b/traceroute.h index 396088a..2f1512d 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/translate.c b/translate.c index 1cc83f9..cefa9da 100644 --- a/translate.c +++ b/translate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.ch> * diff --git a/translate.h b/translate.h index c6259d0..e349a70 100644 --- a/translate.h +++ b/translate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> *

1 0

[batman-adv] master's head updated: batman-adv: Automatically create nested kfree_rcu helper functions (13f9fdd)
by postmaster＠open-mesh.org 21 Apr '15

21 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e78c16c batman-adv: Revert "fix var name to keep compatibility with old kernels" 9f01c16 Merge branch 'next' 5857ad3 batman-adv: Remove explicit compat.h include and split compat.h 7df6200 batman-adv: Add required includes to all files d40162d batman-adv: Remove unused IFF_BRIDGE_PORT live patching hack 13f9fdd batman-adv: Automatically create nested kfree_rcu helper functions

1 0

[batman-adv] master: batman-adv: Automatically create nested kfree_rcu helper functions (13f9fdd)
by postmaster＠open-mesh.org 21 Apr '15

21 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 13f9fdda0632303932f1776c08c80f971189eca3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 17 19:40:30 2015 +0200 batman-adv: Automatically create nested kfree_rcu helper functions The kfree_rcu compat helper for old kernels require a special function that knows how to calculate the offsets to the actual data pointer to call kfree. These can either be manually provided or the GCC extension for nested functions can be used to automatically create a local function using a macro. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 13f9fdda0632303932f1776c08c80f971189eca3 Makefile | 1 - compat-include/linux/rcupdate.h | 15 +++++ compat.c | 120 --------------------------------------- compat.h | 20 ------- 4 files changed, 15 insertions(+), 141 deletions(-) diff --git a/Makefile b/Makefile index fd7ae8d..e57fcb3 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,6 @@ NOSTDINC_FLAGS := \ $(CFLAGS) CONFIG_BATMAN_ADV=m -batman-adv-y += compat.o ifneq ($(REVISION),) ccflags-y += -DBATADV_SOURCE_VERSION=\"$(REVISION)\" endif diff --git a/compat-include/linux/rcupdate.h b/compat-include/linux/rcupdate.h index f3ed948..12a1c2a 100644 --- a/compat-include/linux/rcupdate.h +++ b/compat-include/linux/rcupdate.h @@ -36,4 +36,19 @@ #endif /* < KERNEL_VERSION(2, 6, 34) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) + +#define kfree_rcu(ptr, rcuhead_name) \ + do { \ + void batadv_free_rcu_##ptr(struct rcu_head *rcu) \ + { \ + void *container_ptr; \ + container_ptr = container_of(rcu, typeof(*(ptr)), rcuhead_name); \ + kfree(container_ptr); \ + } \ + call_rcu(&(ptr)->rcuhead_name, batadv_free_rcu_##ptr); \ + } while (0) + +#endif /* < KERNEL_VERSION(3, 0, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_RCUPDATE_H_ */ diff --git a/compat.c b/compat.c deleted file mode 100644 index 516d06c..0000000 --- a/compat.c +++ /dev/null @@ -1,120 +0,0 @@ -/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#include <linux/in.h> -#include <linux/version.h> -#include "main.h" - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -void batadv_free_rcu_orig_vlan(struct rcu_head *rcu) -{ - struct batadv_orig_node_vlan *vlan; - - vlan = container_of(rcu, struct batadv_orig_node_vlan, rcu); - - kfree(vlan); -} - -void batadv_free_rcu_softif_vlan(struct rcu_head *rcu) -{ - struct batadv_softif_vlan *vlan; - - vlan = container_of(rcu, struct batadv_softif_vlan, rcu); - - kfree(vlan); -} - -void batadv_free_rcu_vlan(struct rcu_head *rcu) -{ - struct batadv_softif_vlan *vlan; - - vlan = container_of(rcu, struct batadv_softif_vlan, rcu); - - kfree(vlan); -} - -void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu) -{ - struct batadv_tt_global_entry *global; - - global = container_of(rcu, struct batadv_tt_global_entry, common.rcu); - - kfree(global); -} - -void batadv_free_rcu_gw_node(struct rcu_head *rcu) -{ - struct batadv_gw_node *gw_node; - - gw_node = container_of(rcu, struct batadv_gw_node, rcu); - kfree(gw_node); -} - -void batadv_free_rcu_tt_local_entry(struct rcu_head *rcu) -{ - struct batadv_tt_common_entry *tt_common_entry; - struct batadv_tt_local_entry *tt_local_entry; - - tt_common_entry = container_of(rcu, struct batadv_tt_common_entry, rcu); - tt_local_entry = container_of(tt_common_entry, - struct batadv_tt_local_entry, common); - kfree(tt_local_entry); -} - -#ifdef CONFIG_BATMAN_ADV_BLA -void batadv_free_rcu_backbone_gw(struct rcu_head *rcu) -{ - struct batadv_bla_backbone_gw *backbone_gw; - - backbone_gw = container_of(rcu, struct batadv_bla_backbone_gw, rcu); - kfree(backbone_gw); -} -#endif - -#ifdef CONFIG_BATMAN_ADV_DAT -void batadv_free_rcu_dat_entry(struct rcu_head *rcu) -{ - struct batadv_dat_entry *dat_entry; - - dat_entry = container_of(rcu, struct batadv_dat_entry, rcu); - kfree(dat_entry); -} -#endif - -#ifdef CONFIG_BATMAN_ADV_NC -void batadv_free_rcu_nc_path(struct rcu_head *rcu) -{ - struct batadv_nc_path *nc_path; - - nc_path = container_of(rcu, struct batadv_nc_path, rcu); - kfree(nc_path); -} -#endif - -void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu) -{ - struct batadv_tvlv_handler *tvlv_handler; - - tvlv_handler = container_of(rcu, struct batadv_tvlv_handler, rcu); - kfree(tvlv_handler); -} - -#endif /* < KERNEL_VERSION(3, 0, 0) */ diff --git a/compat.h b/compat.h index 9871a23..99e75c5 100644 --- a/compat.h +++ b/compat.h @@ -88,26 +88,6 @@ static const struct { \ #endif /* < KERNEL_VERSION(2, 6, 39) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0) - -#define kfree_rcu(ptr, rcu_head) call_rcu(&ptr->rcu_head, batadv_free_rcu_##ptr) - -struct rcu_head; - -void batadv_free_rcu_orig_vlan(struct rcu_head *rcu); -void batadv_free_rcu_softif_vlan(struct rcu_head *rcu); -void batadv_free_rcu_tt_global_entry(struct rcu_head *rcu); -void batadv_free_rcu_gw_node(struct rcu_head *rcu); -void batadv_free_rcu_tt_local_entry(struct rcu_head *rcu); -void batadv_free_rcu_backbone_gw(struct rcu_head *rcu); -void batadv_free_rcu_dat_entry(struct rcu_head *rcu); -void batadv_free_rcu_nc_path(struct rcu_head *rcu); -void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu); -void batadv_free_rcu_vlan(struct rcu_head *rcu); - -#endif /* < KERNEL_VERSION(3, 0, 0) */ - - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define batadv_interface_add_vid(x, y, z) \

1 0

[batman-adv] master: batman-adv: Remove unused IFF_BRIDGE_PORT live patching hack (d40162d)
by postmaster＠open-mesh.org 21 Apr '15

21 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d40162d6e0e2d266914b27c93b255a5a8422ed0f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 17 19:40:29 2015 +0200 batman-adv: Remove unused IFF_BRIDGE_PORT live patching hack Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- d40162d6e0e2d266914b27c93b255a5a8422ed0f compat.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/compat.h b/compat.h index 35e3dbd..9871a23 100644 --- a/compat.h +++ b/compat.h @@ -59,8 +59,6 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) -#define IFF_BRIDGE_PORT 0 || (hard_iface->net_dev->br_port ? 1 : 0) - /* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ #define addr_assign_type ifindex

1 0

[batman-adv] master: Merge branch 'next' (9f01c16)
by postmaster＠open-mesh.org 21 Apr '15

21 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9f01c16a4409e43e86629418fae9184fabb59da5 Merge: 141c6e9 e78c16c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Apr 20 23:27:25 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- 9f01c16a4409e43e86629418fae9184fabb59da5 compat.c | 9 +++++++++ compat.h | 1 + soft-interface.c | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-)

1 0

[batman-adv] master: batman-adv: Remove explicit compat.h include and split compat.h (5857ad3)
by postmaster＠open-mesh.org 21 Apr '15

21 Apr '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5857ad34cd5b114c4f98dab81d994b380a6a29e5 Author: Sven Eckelmann <sven(a)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(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)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

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2015