[linux-next] LinuxNextTracking branch, master, updated. next-20130115

batman at open-mesh.org batman at open-mesh.org
Wed Jan 16 00:20:29 CET 2013

The following commit has been merged in the master branch:
commit 467b5fe69716257ebe17a9df9c428ad32eba540a
Author: Antonio Quartulli <antonio at open-mesh.com>
Date:   Fri Dec 7 14:35:36 2012 +0100

    batman-adv: use the const qualifier in hash functions
    The data argument in each hash function should carry the
    "const" qualifier as it is never modified.
    Signed-off-by: Antonio Quartulli <antonio at open-mesh.com>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 724adf0..5e834c1 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -57,7 +57,7 @@ static inline uint32_t batadv_choose_claim(const void *data, uint32_t size)
 static inline uint32_t batadv_choose_backbone_gw(const void *data,
 						 uint32_t size)
-	struct batadv_claim *claim = (struct batadv_claim *)data;
+	const struct batadv_claim *claim = (struct batadv_claim *)data;
 	uint32_t hash = 0;
 	hash = batadv_hash_bytes(hash, &claim->addr, sizeof(claim->addr));
diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h
index e053339..ea02148 100644
--- a/net/batman-adv/hash.h
+++ b/net/batman-adv/hash.h
@@ -89,7 +89,7 @@ static inline void batadv_hash_delete(struct batadv_hashtable *hash,
  *	Returns the new hash value.
-static inline uint32_t batadv_hash_bytes(uint32_t hash, void *data,
+static inline uint32_t batadv_hash_bytes(uint32_t hash, const void *data,
 					 uint32_t size)
 	const unsigned char *key = data;


More information about the linux-merge mailing list