commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

batctl; branch, next, updated. v2012.0.0-6-ge89112f
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit d9ee7eed3175992be75e2cb949c048bdddeb0769 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:41:37 2012 +0100 batctl: Update copyright years Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 85efc30..c85dbaa 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2006-2011 B.A.T.M.A.N. contributors +# Copyright (C) 2006-2012 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 1fe6730..751380f 100644 --- a/allocate.h +++ b/allocate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/bat-hosts.c b/bat-hosts.c index 179e733..ad49618 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/bat-hosts.h b/bat-hosts.h index ba265bb..519862f 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/bisect.c b/bisect.c index d3789aa..b505b1a 100644 --- a/bisect.c +++ b/bisect.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/bisect.h b/bisect.h index 4423608..7c43708 100644 --- a/bisect.h +++ b/bisect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/debug.c b/debug.c index 480e4a5..6a553ff 100644 --- a/debug.c +++ b/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/debug.h b/debug.h index b1648f3..939f281 100644 --- a/debug.h +++ b/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/functions.c b/functions.c index c2c0529..0729f15 100644 --- a/functions.c +++ b/functions.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/functions.h b/functions.h index 7e9f68c..ea953dd 100644 --- a/functions.h +++ b/functions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/hash.c b/hash.c index e8c822f..2a9f557 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 443ef28..91ee7d8 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/list-batman.c b/list-batman.c index 356c1eb..a0c2ad8 100644 --- a/list-batman.c +++ b/list-batman.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/list-batman.h b/list-batman.h index 72d2ac4..ebff97c 100644 --- a/list-batman.h +++ b/list-batman.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index 7f6d1a3..0dfdb8e 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/main.h b/main.h index fb7ca38..22c11b5 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/packet.h b/packet.h index 88c717b..441f3db 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/ping.c b/ping.c index b7c2932..dff0f33 100644 --- a/ping.c +++ b/ping.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/ping.h b/ping.h index ccc717a..e3f47fc 100644 --- a/ping.h +++ b/ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/sys.c b/sys.c index 105bb51..9cdccba 100644 --- a/sys.c +++ b/sys.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/sys.h b/sys.h index 2df846c..5dafe85 100644 --- a/sys.h +++ b/sys.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/tcpdump.c b/tcpdump.c index 8bfcecb..b37b7ec 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de> * diff --git a/tcpdump.h b/tcpdump.h index 925b116..2a2cc0a 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/traceroute.c b/traceroute.c index 4dc41fc..f9e62cd 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/traceroute.h b/traceroute.h index 31edb7e..e78609f 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * diff --git a/vis.c b/vis.c index 1a8d181..b040497 100644 --- a/vis.c +++ b/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Andrew Lunn <andrew(a)lunn.ch> * diff --git a/vis.h b/vis.h index 8d6cfcd..77c6669 100644 --- a/vis.h +++ b/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Andrew Lunn <andrew(a)lunn.ch> * -- batctl

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit a03748760887f866252363b8029d65770927f45c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 5 15:23:55 2012 +0100 batman-adv: batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 7f2d737..3b727dd 100644 --- a/main.h +++ b/main.h @@ -28,7 +28,7 @@ #define DRIVER_DEVICE "batman-adv" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.0.0" +#define SOURCE_VERSION "2012.1.0" #endif /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 20b62f30208f334c6a320a4c24b7496319b06ae3 Merge: e4172b0c922f6b4242e1e64789c47bd30afc55e9 c548b324f8f77b386c95f3300f3d85609d6f541f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 5 15:23:00 2012 +0100 Merge commit 'v2012.0.0' Conflicts: README diff --combined README.external index 4aa4763,0000000..98b6e22 mode 100644,000000..100644 --- a/README.external +++ b/README.external @@@ -1,45 -1,0 +1,45 @@@ +BATMAN-ADV external module +-------------------------- + +The batman-adv module is shipped as part of the Linux kernel +and as external module. The external module allows to get +new features without upgrading to a newer kernel version +and to get batman-adv specific bugfixes for kernels that are +not supported anymore. It compiles against and should work - with Linux 2.6.29 - 3.2. Supporting older versions is not ++with Linux 2.6.29 - 3.3. Supporting older versions is not +planned, but it's probably easy to backport it. If you work on a +backport, feel free to contact us. :-) + +COMPILE +------- + +To compile against your currently installed kernel, just type: + +# make + +if you want to compile against some other kernel, use: + +# make KERNELPATH=/path/to/kernel + +if you wont to install this module: + +# sudo make install + +CONFIGURATION +------------- + +The in-kernel module can be configured through +menuconfig. When compiling outside of the kernel, tree it is +necessary to configure it using the make options. Each +option can be set to to y (enabled), n (disabled) or m (build as +module). Available options and their possible values are +(default marked with an "*") + + * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) + +e.g., debugging can be enabled by + +# make CONFIG_BATMAN_ADV_DEBUG=y + +Keep in mind that all options must also be added to "make +install" call. -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 5c5fa228037210616cb17c969bcaea2e0d7d310a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:33 2012 +0100 batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() In case of a new tt_local_entry, the TT_CLIENT_NEW flag has to be set before adding such entry to the hash table. Otherwise, it opens a race condition in which the entry can be found but the flag has not been set. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index 7ea4c42..b493ab4 100644 --- a/translation-table.c +++ b/translation-table.c @@ -210,6 +210,11 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (compare_eth(addr, soft_iface->dev_addr)) tt_local_entry->common.flags |= TT_CLIENT_NOPURGE; + /* The local entry has to be marked as NEW to avoid to send it in + * a full table response going out before the next ttvn increment + * (consistency check) */ + tt_local_entry->common.flags |= TT_CLIENT_NEW; + hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, &tt_local_entry->common, &tt_local_entry->common.hash_entry); @@ -222,11 +227,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, tt_local_event(bat_priv, addr, tt_local_entry->common.flags); - /* The local entry has to be marked as NEW to avoid to send it in - * a full table response going out before the next ttvn increment - * (consistency check) */ - tt_local_entry->common.flags |= TT_CLIENT_NEW; - /* remove address from global hash if present */ tt_global_entry = tt_global_hash_find(bat_priv, addr); -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit b82b9b254c8a923fb2d65e2ca3eefc2e8b4429e7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 1 00:41:38 2012 +0100 batman-adv: Update copyright years Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index e2276be..776cca4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/Makefile.kbuild b/Makefile.kbuild index ce68611..4e392eb 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # diff --git a/bat_algo.h b/bat_algo.h index 755379f..9852a68 100644 --- a/bat_algo.h +++ b/bat_algo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_debugfs.c b/bat_debugfs.c index a7a393e..c3b0548 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_debugfs.h b/bat_debugfs.h index bc9cda3..d605c67 100644 --- a/bat_debugfs.h +++ b/bat_debugfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 1c483a5..2b66dae 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/bat_sysfs.c b/bat_sysfs.c index 480ae0a..7317729 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_sysfs.h b/bat_sysfs.h index a3f75a7..fece77a 100644 --- a/bat_sysfs.h +++ b/bat_sysfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bitarray.c b/bitarray.c index 9bc63b2..e63069d 100644 --- a/bitarray.c +++ b/bitarray.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/bitarray.h b/bitarray.h index 9c04422..c613572 100644 --- a/bitarray.h +++ b/bitarray.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/compat.c b/compat.c index 855360e..c3dc59b 100644 --- a/compat.c +++ b/compat.c @@ -1,3 +1,27 @@ +/* + * Copyright (C) 2007-2012 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * + * 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" diff --git a/compat.h b/compat.h index c71d928..7f86b41 100644 --- a/compat.h +++ b/compat.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/gateway_client.c b/gateway_client.c index df5631e..65a77a1 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_client.h b/gateway_client.h index e1edba0..bf56a5a 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.c b/gateway_common.c index c4ac7b0..7f79e15 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.h b/gateway_common.h index 55e527a..b8fb11c 100644 --- a/gateway_common.h +++ b/gateway_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/hard-interface.c b/hard-interface.c index ff5ba40..41826b9 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hard-interface.h b/hard-interface.h index 67f78d1..e68c565 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hash.c b/hash.c index d1da29d..117687b 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 4768717..d4bd786 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/icmp_socket.c b/icmp_socket.c index 5d69e10..9b755f9 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/icmp_socket.h b/icmp_socket.h index 462b190..380ed4c 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index 8ae497b..08f3b3a 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/main.h b/main.h index d124c28..7f2d737 100644 --- a/main.h +++ b/main.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/originator.c b/originator.c index 1161f27..c2e46b5 100644 --- a/originator.c +++ b/originator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/originator.h b/originator.h index 67765ff..3fe2eda 100644 --- a/originator.h +++ b/originator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/packet.h b/packet.h index 88c717b..441f3db 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/ring_buffer.c b/ring_buffer.c index f1ccfa7..fd63951 100644 --- a/ring_buffer.c +++ b/ring_buffer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/ring_buffer.h b/ring_buffer.h index 7cdfe62..8b58bd8 100644 --- a/ring_buffer.h +++ b/ring_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/routing.c b/routing.c index c1e45c0..cf9a2f6 100644 --- a/routing.c +++ b/routing.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/routing.h b/routing.h index 7aaee0f..92ac100 100644 --- a/routing.h +++ b/routing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.c b/send.c index 019337e..4137580 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.h b/send.h index c8ca3ef..824ef06 100644 --- a/send.h +++ b/send.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.c b/soft-interface.c index c41dac3..2ffdc74 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.h b/soft-interface.h index 001546f..756eab5 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/translation-table.c b/translation-table.c index 9fe38c1..7ea4c42 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/translation-table.h b/translation-table.h index 30efd49..c753633 100644 --- a/translation-table.h +++ b/translation-table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/types.h b/types.h index 650ce5f..302efb5 100644 --- a/types.h +++ b/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/unicast.c b/unicast.c index 6f3c659..0897dfa 100644 --- a/unicast.c +++ b/unicast.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/unicast.h b/unicast.h index 8fd5535..a9faf6b 100644 --- a/unicast.h +++ b/unicast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/vis.c b/vis.c index 4f4b2a0..c4a5b8c 100644 --- a/vis.c +++ b/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis.h b/vis.h index 851bc4f..ee2e46e 100644 --- a/vis.h +++ b/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit 4ead48deb9e0cc3537f538b258e2769f035d68b3 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Jan 6 21:31:34 2012 +0100 batman-adv: code refactoring - move debug print into tt_local_set_pending Each tt_local_set_pending is always followed by a bat_dbg invocation. This can be simplified by moving the bat_dbg() call. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index b493ab4..d105cbd 100644 --- a/translation-table.c +++ b/translation-table.c @@ -355,7 +355,7 @@ out: static void tt_local_set_pending(struct bat_priv *bat_priv, struct tt_local_entry *tt_local_entry, - uint16_t flags) + uint16_t flags, const char *message) { tt_local_event(bat_priv, tt_local_entry->common.addr, tt_local_entry->common.flags | flags); @@ -364,6 +364,9 @@ static void tt_local_set_pending(struct bat_priv *bat_priv, * to be kept in the table in order to send it in a full table * response issued before the net ttvn increment (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_PENDING; + + bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " + "%s\n", tt_local_entry->common.addr, message); } void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, @@ -376,10 +379,7 @@ void tt_local_remove(struct bat_priv *bat_priv, const uint8_t *addr, goto out; tt_local_set_pending(bat_priv, tt_local_entry, TT_CLIENT_DEL | - (roaming ? TT_CLIENT_ROAM : NO_FLAGS)); - - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) pending to be removed: " - "%s\n", tt_local_entry->common.addr, message); + (roaming ? TT_CLIENT_ROAM : NO_FLAGS), message); out: if (tt_local_entry) tt_local_entry_free_ref(tt_local_entry); @@ -417,10 +417,7 @@ static void tt_local_purge(struct bat_priv *bat_priv) continue; tt_local_set_pending(bat_priv, tt_local_entry, - TT_CLIENT_DEL); - bat_dbg(DBG_TT, bat_priv, "Local tt entry (%pM) " - "pending to be removed: timed out\n", - tt_local_entry->common.addr); + TT_CLIENT_DEL, "timed out"); } spin_unlock_bh(list_lock); } -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit e40ea1503eef99e779a46e3197a94c56aab4fb49 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jan 12 19:07:00 2012 +0100 batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Actually the TT_CLIENT_PENDING flag is never set in the tt_global_entry structure, therefore this code is useless and can be removed. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index d105cbd..27753a0 100644 --- a/translation-table.c +++ b/translation-table.c @@ -603,7 +603,7 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) struct tt_global_entry, common); seq_printf(seq, " * %pM (%3u) via %pM (%3u) " - "[%c%c%c]\n", + "[%c%c]\n", tt_global_entry->common.addr, tt_global_entry->ttvn, tt_global_entry->orig_node->orig, @@ -613,8 +613,6 @@ int tt_global_seq_print_text(struct seq_file *seq, void *offset) (tt_global_entry->common.flags & TT_CLIENT_ROAM ? 'R' : '.'), (tt_global_entry->common.flags & - TT_CLIENT_PENDING ? 'X' : '.'), - (tt_global_entry->common.flags & TT_CLIENT_WIFI ? 'W' : '.')); } rcu_read_unlock(); @@ -838,11 +836,6 @@ struct orig_node *transtable_search(struct bat_priv *bat_priv, if (!atomic_inc_not_zero(&tt_global_entry->orig_node->refcount)) goto out; - /* A global client marked as PENDING has already moved from that - * originator */ - if (tt_global_entry->common.flags & TT_CLIENT_PENDING) - goto out; - orig_node = tt_global_entry->orig_node; out: -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit d2c993d1532362a5c6e14e4bc9f0b2dfad64ed24 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Tue Dec 27 17:24:07 2011 +0100 batman-adv: convert all times to miliseconds has_timed_out() takes the second argument in miliseconds. The commit "batman-adv: convert time_after instances to has_timed_out" introduced some bugs by confusing seconds and miliseconds. This patch converts all timeouts to miliseconds to be consistent, and also fixes the previously introduced bugs. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/gateway_client.c b/gateway_client.c index 24403a7..df5631e 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -396,7 +396,7 @@ void gw_node_purge(struct bat_priv *bat_priv) { struct gw_node *gw_node, *curr_gw; struct hlist_node *node, *node_tmp; - unsigned long timeout = 2 * PURGE_TIMEOUT * HZ; + unsigned long timeout = msecs_to_jiffies(2 * PURGE_TIMEOUT); int do_deselect = 0; curr_gw = gw_get_selected_gw_node(bat_priv); diff --git a/main.h b/main.h index 222c120..d124c28 100644 --- a/main.h +++ b/main.h @@ -41,13 +41,14 @@ /* purge originators after time in seconds if no valid packet comes in * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ -#define PURGE_TIMEOUT 200 -#define TT_LOCAL_TIMEOUT 3600 /* in seconds */ -#define TT_CLIENT_ROAM_TIMEOUT 600 +#define PURGE_TIMEOUT 200000 /* 200 seconds */ +#define TT_LOCAL_TIMEOUT 3600000 /* in miliseconds */ +#define TT_CLIENT_ROAM_TIMEOUT 600000 /* in miliseconds */ /* sliding packet range of received originator messages in sequence numbers * (should be a multiple of our word size) */ #define TQ_LOCAL_WINDOW_SIZE 64 -#define TT_REQUEST_TIMEOUT 3 /* seconds we have to keep pending tt_req */ +#define TT_REQUEST_TIMEOUT 3000 /* miliseconds we have to keep + * pending tt_req */ #define TQ_GLOBAL_WINDOW_SIZE 5 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 @@ -56,8 +57,8 @@ #define TT_OGM_APPEND_MAX 3 /* number of OGMs sent with the last tt diff */ -#define ROAMING_MAX_TIME 20 /* Time in which a client can roam at most - * ROAMING_MAX_COUNT times */ +#define ROAMING_MAX_TIME 20000 /* Time in which a client can roam at most + * ROAMING_MAX_COUNT times in miliseconds*/ #define ROAMING_MAX_COUNT 5 #define NO_FLAGS 0 diff --git a/translation-table.c b/translation-table.c index a1be7ef..9fe38c1 100644 --- a/translation-table.c +++ b/translation-table.c @@ -413,7 +413,7 @@ static void tt_local_purge(struct bat_priv *bat_priv) continue; if (!has_timed_out(tt_local_entry->last_seen, - TT_LOCAL_TIMEOUT * 1000)) + TT_LOCAL_TIMEOUT)) continue; tt_local_set_pending(bat_priv, tt_local_entry, @@ -753,7 +753,7 @@ static void tt_global_roam_purge(struct bat_priv *bat_priv) if (!(tt_global_entry->common.flags & TT_CLIENT_ROAM)) continue; if (!has_timed_out(tt_global_entry->roam_at, - TT_CLIENT_ROAM_TIMEOUT * 1000)) + TT_CLIENT_ROAM_TIMEOUT)) continue; bat_dbg(DBG_TT, bat_priv, "Deleting global " @@ -972,8 +972,7 @@ static void tt_req_purge(struct bat_priv *bat_priv) spin_lock_bh(&bat_priv->tt_req_list_lock); list_for_each_entry_safe(node, safe, &bat_priv->tt_req_list, list) { - if (has_timed_out(node->issued_at, - TT_REQUEST_TIMEOUT * 1000)) { + if (has_timed_out(node->issued_at, TT_REQUEST_TIMEOUT)) { list_del(&node->list); kfree(node); } @@ -992,7 +991,7 @@ static struct tt_req_node *new_tt_req_node(struct bat_priv *bat_priv, list_for_each_entry(tt_req_node_tmp, &bat_priv->tt_req_list, list) { if (compare_eth(tt_req_node_tmp, orig_node) && !has_timed_out(tt_req_node_tmp->issued_at, - TT_REQUEST_TIMEOUT * 1000)) + TT_REQUEST_TIMEOUT)) goto unlock; } @@ -1585,8 +1584,7 @@ static void tt_roam_purge(struct bat_priv *bat_priv) spin_lock_bh(&bat_priv->tt_roam_list_lock); list_for_each_entry_safe(node, safe, &bat_priv->tt_roam_list, list) { - if (!has_timed_out(node->first_time, - ROAMING_MAX_TIME * 1000)) + if (!has_timed_out(node->first_time, ROAMING_MAX_TIME)) continue; list_del(&node->list); @@ -1613,8 +1611,7 @@ static bool tt_check_roam_count(struct bat_priv *bat_priv, if (!compare_eth(tt_roam_node->addr, client)) continue; - if (has_timed_out(tt_roam_node->first_time, - ROAMING_MAX_TIME * 1000)) + if (has_timed_out(tt_roam_node->first_time, ROAMING_MAX_TIME)) continue; if (!atomic_dec_not_zero(&tt_roam_node->counter)) diff --git a/vis.h b/vis.h index 31b820d..851bc4f 100644 --- a/vis.h +++ b/vis.h @@ -22,7 +22,8 @@ #ifndef _NET_BATMAN_ADV_VIS_H_ #define _NET_BATMAN_ADV_VIS_H_ -#define VIS_TIMEOUT 200 /* timeout of vis packets in seconds */ +#define VIS_TIMEOUT 200000 /* timeout of vis packets + * in miliseconds */ int vis_seq_print_text(struct seq_file *seq, void *offset); void receive_server_sync_packet(struct bat_priv *bat_priv, -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit f379f93aef18d6f2cfc0342e3ee77ef630e6e346 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 23 22:38:01 2011 +0100 batman-adv: Fix compilation with linux 2.6.29 and 2.6.30 Linux v2.6.30-2332-gfddd520 introduced a seventh parameter to __module_param_call. It is used to give a slightly different user experience for bool parameters. Older kernels can just drop this information using a special compat wrapper for __module_param_call. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index 3733f68..c71d928 100644 --- a/compat.h +++ b/compat.h @@ -42,6 +42,7 @@ #endif /* < KERNEL_VERSION(2, 6, 33) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) #define hlist_first_rcu(head) (*((struct hlist_node **)(&(head)->first))) @@ -56,6 +57,20 @@ #endif /* < KERNEL_VERSION(2, 6, 34) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + +#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ + __module_param_call(p1, p2, p3, p4, p5, p7) + +#else + +#define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ + __module_param_call(p1, p2, p3, p4, p5, p6, p7) + +#endif /* < KERNEL_VERSION(2, 6, 31) */ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) #define __rcu @@ -77,10 +92,10 @@ struct kernel_param_ops { static int __compat_get_param_##name(char *buffer, \ struct kernel_param *kp) \ { return (ops)->get(buffer, kp); } \ - __module_param_call(MODULE_PARAM_PREFIX, name, \ - __compat_set_param_##name, \ - __compat_get_param_##name, arg, \ - __same_type((arg), bool *), perm) + __compat__module_param_call(MODULE_PARAM_PREFIX, name, \ + __compat_set_param_##name, \ + __compat_get_param_##name, arg, \ + __same_type((arg), bool *), perm) static inline int __param_set_copystring(const char *val, const struct kernel_param *kp) @@ -91,6 +106,7 @@ static inline int __param_set_copystring(const char *val, #endif /* < KERNEL_VERSION(2, 6, 36) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) #define kstrtoul strict_strtoul @@ -98,6 +114,7 @@ static inline int __param_set_copystring(const char *val, #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, free_rcu_##ptr) -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.0.0-34-ga037487
by postmaster＠open-mesh.org 05 Feb '12

05 Feb '12

The following commit has been merged in the next branch: commit e745802096d9e9d02752682b80d1efa3d41f5855 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 23 21:53:27 2011 +0100 batman-adv: Split README in kernel and external part The README is shipped in a stripped down version as part of the kernel under Documentation/networking/batman-adv.txt. The readme has to be manually merged each time it gets prepared for submission to the networking subsystem maintainer after the README was modified. This extra work is reduced by splitting it in a README which contains the same data as available in the kernel and README.external which contains the information that only affect the external module. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 58d3473..01db663 100644 --- a/README +++ b/README @@ -15,26 +15,7 @@ are: IPv4, IPv6, DHCP, IPX. Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, -vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.29 - 3.2. Supporting -older versions is not planned, but it's probably easy to backport -it. If you work on a backport, feel free to contact us. :-) - - -COMPILE -------- - -To compile against your currently installed kernel, just type: - -# make - -if you want to compile against some other kernel, use: - -# make KERNELPATH=/path/to/kernel - -if you wont to install this module: - -# sudo make install +vpn, etc ... (anything with ethernet-style layer 2). CONFIGURATION @@ -89,6 +70,7 @@ folder: # ap_isolation gw_bandwidth hop_penalty # bonding gw_mode orig_interval + There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ @@ -204,11 +186,7 @@ When investigating problems with your mesh network it is some- times necessary to see more detail debug messages. This must be enabled when compiling the batman-adv module. When building bat- man-adv as part of kernel, use "make menuconfig" and enable the -option "B.A.T.M.A.N. debugging". When compiling outside of the -kernel tree it is necessary to enable it using the make option -CONFIG_BATMAN_ADV_DEBUG=y - -# make CONFIG_BATMAN_ADV_DEBUG=y +option "B.A.T.M.A.N. debugging". Those additional debug messages can be accessed using a special file in debugfs diff --git a/README.external b/README.external new file mode 100644 index 0000000..4aa4763 --- /dev/null +++ b/README.external @@ -0,0 +1,45 @@ +BATMAN-ADV external module +-------------------------- + +The batman-adv module is shipped as part of the Linux kernel +and as external module. The external module allows to get +new features without upgrading to a newer kernel version +and to get batman-adv specific bugfixes for kernels that are +not supported anymore. It compiles against and should work +with Linux 2.6.29 - 3.2. Supporting older versions is not +planned, but it's probably easy to backport it. If you work on a +backport, feel free to contact us. :-) + +COMPILE +------- + +To compile against your currently installed kernel, just type: + +# make + +if you want to compile against some other kernel, use: + +# make KERNELPATH=/path/to/kernel + +if you wont to install this module: + +# sudo make install + +CONFIGURATION +------------- + +The in-kernel module can be configured through +menuconfig. When compiling outside of the kernel, tree it is +necessary to configure it using the make options. Each +option can be set to to y (enabled), n (disabled) or m (build as +module). Available options and their possible values are +(default marked with an "*") + + * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) + +e.g., debugging can be enabled by + +# make CONFIG_BATMAN_ADV_DEBUG=y + +Keep in mind that all options must also be added to "make +install" call. -- batman-adv

1 0

← Newer
1
...
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012