The following commit has been merged in the master branch:
commit af01e991adc9ad97110c0468474101f37bbc95cc
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat May 5 13:27:27 2012 +0200
batman-adv: Only set hash class after hash is initialized
We must be sure that there was no error during the creation of the hash before
we can set the hash lock class. The class set function was added to the wrong
place in 2c9aa3b4c37bd55148f5f25212c89e7bf5f28497
Signed-…
[View More]off-by: Sven Eckelmann <sven(a)narfation.org>
diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c
index 8bb274b..48831c2 100644
--- a/bridge_loop_avoidance.c
+++ b/bridge_loop_avoidance.c
@@ -1169,13 +1169,13 @@ int bla_init(struct bat_priv *bat_priv)
bat_priv->claim_hash = hash_new(128);
bat_priv->backbone_hash = hash_new(32);
+ if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
+ return -1;
+
hash_set_lock_class(bat_priv->claim_hash, &claim_hash_lock_class_key);
hash_set_lock_class(bat_priv->backbone_hash,
&backbone_hash_lock_class_key);
- if (!bat_priv->claim_hash || !bat_priv->backbone_hash)
- return -1;
-
bat_dbg(DBG_BLA, bat_priv, "bla hashes initialized\n");
bla_start_timer(bat_priv);
--
batman-adv
[View Less]
The following commit has been merged in the master branch:
commit 515bdd0d7e0913e0d4c5e4e526248465f2ead39c
Author: Martin Hundebøll <martin(a)hundeboll.net>
Date: Thu May 3 10:15:07 2012 +0200
] batman-adv: Change "make install" path and run depmod
Currently, when installing the out-of-tree module on distributions that
use gzipped modules, batman-adv.ko will be installed next to
batman-adv.ko.gz, which is selected by kmod.
By changing the install path to
…
[View More] /lib/modules/`uname -r`/updates/net/batman-adv/
and running "depmod -a", we make the newly installed module used by
kmod.
Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net>
diff --git a/Makefile b/Makefile
index ac84fba..57530db 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ clean:
$(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) clean
install: config
- $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=kernel/net/batman-adv/ modules_install
+ $(MAKE) -C $(KERNELPATH) M=$(PWD) PWD=$(PWD) INSTALL_MOD_DIR=updates/net/batman-adv/ modules_install
+ depmod -a
config:
$(PWD)/gen-compat-autoconf.sh $(PWD)/compat-autoconf.h
--
batman-adv
[View Less]
The annotated tag, batman-adv-for-davem has been updated
to 0177649f776ef82b4b4ceb73d5e7b926b24e5af1 (tag)
from ad1c8b0817e002e9901b44be822a90251713fadb (which is now obsolete)
tagging 969e62ad00763fed9ea28700ef7a7d97fdbfddf3 (commit)
replaces v3.4-rc4
tagged by Antonio Quartulli
on Tue May 1 09:49:12 2012 +0200
- Shortlog ------------------------------------------------------------
Included changes:
* minor fixes and cleanups
* minor routing protocol API …
[View More]cleanups
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQEcBAABAgAGBQJPn5WIAAoJEFMQTLzJFOZFUJoIAMM+4o6lKZnnO0uWXE2xbxDA
QJJoQP5D0uLcxAHJaxxTXc0lvQnqAa1+EFouQPZAOo9Gt93kZSSaZgOuLLqVfnaF
QtToFn/JCQtit6vwJiPsNn+83zj94a2QWT72Ddq7gG6CeeOaGJIXHn1Nhhlf1Y2n
m7Zmg4hhHAMzjswOkflOU4NL4adWwzXGe0lnD3NE+t/x6z5avuo22VigCXf+h8dl
d5cPx7LAGRJGswXEM1xj50bAvnc6ZGfoXmgRGFPoBJalN0K8HyxAeNZr4zsl+u7l
ql9nRrDWUZx57snyGrCyn1DPmu3mu2vqHSnIUACsv0BDBaPWCNU3Q/YWtGk/URc=
=fEZn
-----END PGP SIGNATURE-----
Antonio Quartulli (8):
batman-adv: clean up Kconfig
batman-adv: use ETH_ALEN instead of hardcoded numeric constants
batman-adv: convert the tt_crc to network order
batman-adv: remove duplicated line in comment
batman-adv: use ETH_HLEN instead of sizeof(struct ethhdr)
batman-adv: print OGM seq numbers as unsigned int
batman-adv: skip the window protection test when the originator has no neighbours
batman-adv: fix wrong dhcp option list browsing
Eric Dumazet (1):
net: cleanup unsigned to unsigned int
Marek Lindner (15):
batman-adv: encourage batman to take shorter routes by changing the default hop penalty
batman-adv: move ogm initialization into the proper function
batman-adv: refactoring API: find generalized name for bat_ogm_init callback
batman-adv: randomize initial seqno to avoid collision
batman-adv: add iface_disable() callback to routing API
batman-adv: handle routing code initialization properly
batman-adv: refactoring API: find generalized name for bat_ogm_init_primary callback
batman-adv: rename BATMAN_OGM_LEN to BATMAN_OGM_HLEN
batman-adv: mark existing ogm variables as batman iv
batman-adv: introduce is_single_hop_neigh variable to increase readability
batman-adv: introduce packet type handler array for incoming packets
batman-adv: register batman ogm receive function during protocol init
batman-adv: rename last_valid to last_seen
batman-adv: replace HZ calculations with jiffies_to_msecs()
batman-adv: split neigh_new function into generic and batman iv specific parts
Simon Wunderlich (10):
batman-adv: remove old bridge loop avoidance code
batman-adv: add basic bridge loop avoidance code
batman-adv: make bridge loop avoidance switchable
batman-adv: export claim tables through debugfs
batman-adv: allow multiple entries in tt_global_entries
batman-adv: don't let backbone gateways exchange tt entries
batman-adv: add broadcast duplicate check
batman-adv: drop STP over batman
batman-adv: form groups in the bridge loop avoidance
batman-adv: add bridge loop avoidance compile option
Sven Eckelmann (2):
batman-adv: Replace bitarray operations with bitmap
batman-adv: Remove declaration of only locally used functions
-----------------------------------------------------------------------
--
linux integration
[View Less]