The following commit has been merged in the master branch: commit e06a183be0088d17bd9a8ead5770a9f11a2fa04c Author: Sven Eckelmann sven@narfation.org Date: Fri Jan 21 15:11:26 2011 +0000

batman-adv: Silence checkpatch warnings about spinlocks

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/hash.h b/hash.h index d47735c..a975e07 100644 --- a/hash.h +++ b/hash.h @@ -70,7 +70,7 @@ static inline void hash_delete(struct hashtable_t *hash, struct hlist_head *head; struct hlist_node *walk, *safe; struct element_t *bucket; - spinlock_t *list_lock; + spinlock_t *list_lock; /* spinlock to protect write access */ int i;

for (i = 0; i < hash->size; i++) { @@ -100,7 +100,7 @@ static inline int hash_add(struct hashtable_t *hash, struct hlist_head *head; struct hlist_node *walk, *safe; struct element_t *bucket; - spinlock_t *list_lock; + spinlock_t *list_lock; /* spinlock to protect write access */

if (!hash) goto err; diff --git a/originator.c b/originator.c index 5a6745f..cf2ec37 100644 --- a/originator.c +++ b/originator.c @@ -150,7 +150,7 @@ void originator_free(struct bat_priv *bat_priv) struct hlist_node *walk, *safe; struct hlist_head *head; struct element_t *bucket; - spinlock_t *list_lock; + spinlock_t *list_lock; /* spinlock to protect write access */ struct orig_node *orig_node; int i;

@@ -353,7 +353,7 @@ static void _purge_orig(struct bat_priv *bat_priv) struct hlist_node *walk, *safe; struct hlist_head *head; struct element_t *bucket; - spinlock_t *list_lock; + spinlock_t *list_lock; /* spinlock to protect write access */ struct orig_node *orig_node; int i;