The following commit has been merged in the master branch: commit 14b1316b6944b0d552e3c541d0d48d432d3be4b0 Author: Antonio Quartulli ordex@autistici.org Date: Sun Feb 26 15:39:41 2012 +0100

batman-adv: print OGM seq numbers as unsigned long

OGM sequence numbers are declared as uint32_t and so they have to printed using %u instead of %d in order to avoid wrong representations.

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 42c121d..c42e030 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -152,7 +152,7 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet, "Sending own" : "Forwarding")); bat_dbg(DBG_BATMAN, bat_priv, - "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d," + "%s %spacket (originator %pM, seqno %u, TQ %d, TTL %d," " IDF %s, ttvn %d) on interface %s [%pM]\n", fwd_str, (packet_num > 0 ? "aggregated " : ""), batman_ogm_packet->orig, @@ -213,7 +213,7 @@ static void bat_iv_ogm_emit(struct forw_packet *forw_packet)

/* FIXME: what about aggregated packets ? */ bat_dbg(DBG_BATMAN, bat_priv, - "%s packet (originator %pM, seqno %d, TTL %d) " + "%s packet (originator %pM, seqno %u, TTL %d) " "on interface %s [%pM]\n", (forw_packet->own ? "Sending own" : "Forwarding"), batman_ogm_packet->orig, @@ -900,7 +900,7 @@ static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,

if (need_update) { bat_dbg(DBG_BATMAN, bat_priv, - "updating last_seqno: old %d, new %d\n", + "updating last_seqno: old %u, new %u\n", orig_node->last_real_seqno, batman_ogm_packet->seqno); orig_node->last_real_seqno = batman_ogm_packet->seqno; } @@ -954,7 +954,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr,

bat_dbg(DBG_BATMAN, bat_priv, "Received BATMAN packet via NB: %pM, IF: %s [%pM] " - "(from OG: %pM, via prev OG: %pM, seqno %d, ttvn %u, " + "(from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, " "crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n", ethhdr->h_source, if_incoming->net_dev->name, if_incoming->net_dev->dev_addr, batman_ogm_packet->orig,