The following commit has been merged in the merge/master branch: commit 285c0ca0c546b6aaed4118182744b5bec899086b Merge: e029a83ab2c8cf5fe9fbedc64372616db4ffe58e a42b051cae39cf1882fd2dfeab0d31d99d969577 Author: Antonio Quartulli ordex@autistici.org Date: Sun Dec 23 12:26:05 2012 +0100
Merge remote-tracking branch 'pkg/master' into merge/master
diff --combined net/batman-adv/bat_iv_ogm.c index 83dfcb4,ff56fd5..ff56fd5 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -1028,7 -1028,7 +1028,7 @@@ static void batadv_iv_ogm_process(cons is_single_hop_neigh = true;
batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %#.4x, changes %u, td %d, TTL %d, V %d, IDF %d)\n", + "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %#.4x, changes %u, tq %d, TTL %d, V %d, IDF %d)\n", ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batadv_ogm_packet->orig, batadv_ogm_packet->prev_sender, diff --combined net/batman-adv/bridge_loop_avoidance.c index 724adf0,5e834c1..5e834c1 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -57,7 -57,7 +57,7 @@@ static inline uint32_t batadv_choose_cl 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 --combined net/batman-adv/hash.h index e053339,ea02148..ea02148 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@@ -89,7 -89,7 +89,7 @@@ static inline void batadv_hash_delete(s * * 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;