From f498a90b77c7bfb7c88862881f186c019302d047 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 20 Apr 2017 15:36:35 +0300 Subject: [PATCH] net: pkt: Make the debug print eye friendly Print "pkt" instead of "Pkt" when printing network packet pointer value. Change-Id: Id4225be9c55807def3d892d372cdfc5c79c871fc Signed-off-by: Jukka Rissanen --- subsys/net/ip/6lo.c | 2 +- subsys/net/ip/ipv6.c | 4 ++-- subsys/net/ip/net_pkt.c | 10 +++++----- tests/net/route/src/main.c | 4 ++-- tests/net/rpl/src/main.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c index 2aeefc05a38..732bb836367 100644 --- a/subsys/net/ip/6lo.c +++ b/subsys/net/ip/6lo.c @@ -1439,7 +1439,7 @@ bool net_6lo_uncompress(struct net_pkt *pkt) return uncompress_ipv6_header(pkt); } - NET_DBG("Pkt is not compressed"); + NET_DBG("pkt %p is not compressed", pkt); return true; } diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c index 95001661be2..f66b27ef138 100644 --- a/subsys/net/ip/ipv6.c +++ b/subsys/net/ip/ipv6.c @@ -951,9 +951,9 @@ try_send: return NULL; } - NET_DBG("Pkt %p (frag %p) will be sent later", pkt, pkt->frags); + NET_DBG("pkt %p (frag %p) will be sent later", pkt, pkt->frags); #else - NET_DBG("Pkt %p (frag %p) cannot be sent, dropping it.", pkt, + NET_DBG("pkt %p (frag %p) cannot be sent, dropping it.", pkt, pkt->frags); net_pkt_unref(pkt); diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 53a4bdda011..da46595f8f5 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -256,11 +256,11 @@ void net_pkt_print_frags(struct net_pkt *pkt) int count = -1, frag_size = 0, ll_overhead = 0; if (!pkt) { - NET_INFO("Pkt %p", pkt); + NET_INFO("pkt %p", pkt); return; } - NET_INFO("Pkt %p frags %p", pkt, pkt->frags); + NET_INFO("pkt %p frags %p", pkt, pkt->frags); NET_ASSERT(pkt->frags); @@ -825,7 +825,7 @@ struct net_buf *net_pkt_frag_del(struct net_pkt *pkt, #endif { #if defined(CONFIG_NET_DEBUG_NET_PKT) - NET_DBG("Pkt %p parent %p frag %p ref %u (%s:%d)", + NET_DBG("pkt %p parent %p frag %p ref %u (%s:%d)", pkt, parent, frag, frag->ref, caller, line); if (frag->ref == 1) { @@ -852,7 +852,7 @@ void net_pkt_frag_add_debug(struct net_pkt *pkt, struct net_buf *frag, void net_pkt_frag_add(struct net_pkt *pkt, struct net_buf *frag) #endif { - NET_DBG("Pkt %p frag %p (%s:%d)", pkt, frag, caller, line); + NET_DBG("pkt %p frag %p (%s:%d)", pkt, frag, caller, line); /* We do not use net_buf_frag_add() as this one will refcount * the frag once more if !pkt->frags @@ -872,7 +872,7 @@ void net_pkt_frag_insert_debug(struct net_pkt *pkt, struct net_buf *frag, void net_pkt_frag_insert(struct net_pkt *pkt, struct net_buf *frag) #endif { - NET_DBG("Pkt %p frag %p (%s:%d)", pkt, frag, caller, line); + NET_DBG("pkt %p frag %p (%s:%d)", pkt, frag, caller, line); net_buf_frag_last(frag)->frags = pkt->frags; pkt->frags = frag; diff --git a/tests/net/route/src/main.c b/tests/net/route/src/main.c index cf0b76c1128..2cb717ed38a 100644 --- a/tests/net/route/src/main.c +++ b/tests/net/route/src/main.c @@ -145,7 +145,7 @@ static int tester_send(struct net_if *iface, struct net_pkt *pkt) return 0; } - DBG("Pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); + DBG("pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); net_pkt_unref(pkt); @@ -185,7 +185,7 @@ static int tester_send_peer(struct net_if *iface, struct net_pkt *pkt) return 0; } - DBG("Pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); + DBG("pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); net_pkt_unref(pkt); diff --git a/tests/net/rpl/src/main.c b/tests/net/rpl/src/main.c index 5415924c889..87564aea7ac 100644 --- a/tests/net/rpl/src/main.c +++ b/tests/net/rpl/src/main.c @@ -145,7 +145,7 @@ static int tester_send(struct net_if *iface, struct net_pkt *pkt) return 0; } - DBG("Pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); + DBG("pkt %p to be sent len %lu\n", pkt, net_pkt_get_len(pkt)); #if 0 net_hexdump_frags("recv", pkt);