| Message ID | 1563291785-6545-1-git-send-email-cai@lca.pw |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] skbuff: fix compilation warnings in skb_dump() | expand |
On Tue, Jul 16, 2019 at 11:43:05AM -0400, Qian Cai wrote: > The commit 6413139dfc64 ("skbuff: increase verbosity when dumping skb > data") introduced a few compilation warnings. > > net/core/skbuff.c:766:32: warning: format specifies type 'unsigned > short' but the argument has type 'unsigned int' [-Wformat] > level, sk->sk_family, sk->sk_type, > sk->sk_protocol); > ^~~~~~~~~~~ > net/core/skbuff.c:766:45: warning: format specifies type 'unsigned > short' but the argument has type 'unsigned int' [-Wformat] > level, sk->sk_family, sk->sk_type, > sk->sk_protocol); > ^~~~~~~~~~~~~~~ > > Fix them by using the proper types. > > Fixes: 6413139dfc64 ("skbuff: increase verbosity when dumping skb data") > Signed-off-by: Qian Cai <cai@lca.pw> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
On Tue, Jul 16, 2019 at 6:53 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > On Tue, Jul 16, 2019 at 11:43:05AM -0400, Qian Cai wrote: > > The commit 6413139dfc64 ("skbuff: increase verbosity when dumping skb > > data") introduced a few compilation warnings. > > > > net/core/skbuff.c:766:32: warning: format specifies type 'unsigned > > short' but the argument has type 'unsigned int' [-Wformat] > > level, sk->sk_family, sk->sk_type, > > sk->sk_protocol); > > ^~~~~~~~~~~ > > net/core/skbuff.c:766:45: warning: format specifies type 'unsigned > > short' but the argument has type 'unsigned int' [-Wformat] > > level, sk->sk_family, sk->sk_type, > > sk->sk_protocol); > > ^~~~~~~~~~~~~~~ > > > > Fix them by using the proper types. > > > > Fixes: 6413139dfc64 ("skbuff: increase verbosity when dumping skb data") > > Signed-off-by: Qian Cai <cai@lca.pw> > > Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Acked-by: Willem de Bruijn <willemb@google.com> Thanks Qian.
From: Qian Cai <cai@lca.pw> Date: Tue, 16 Jul 2019 11:43:05 -0400 > The commit 6413139dfc64 ("skbuff: increase verbosity when dumping skb > data") introduced a few compilation warnings. > > net/core/skbuff.c:766:32: warning: format specifies type 'unsigned > short' but the argument has type 'unsigned int' [-Wformat] > level, sk->sk_family, sk->sk_type, > sk->sk_protocol); > ^~~~~~~~~~~ > net/core/skbuff.c:766:45: warning: format specifies type 'unsigned > short' but the argument has type 'unsigned int' [-Wformat] > level, sk->sk_family, sk->sk_type, > sk->sk_protocol); > ^~~~~~~~~~~~~~~ > > Fix them by using the proper types. > > Fixes: 6413139dfc64 ("skbuff: increase verbosity when dumping skb data") > Signed-off-by: Qian Cai <cai@lca.pw> Applied, thank you.
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6f1e31f674a3..0338820ee0ec 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -762,7 +762,7 @@ void skb_dump(const char *level, const struct sk_buff *skb, bool full_pkt) printk("%sdev name=%s feat=0x%pNF\n", level, dev->name, &dev->features); if (sk) - printk("%ssk family=%hu type=%hu proto=%hu\n", + printk("%ssk family=%hu type=%u proto=%u\n", level, sk->sk_family, sk->sk_type, sk->sk_protocol); if (full_pkt && headroom)
The commit 6413139dfc64 ("skbuff: increase verbosity when dumping skb data") introduced a few compilation warnings. net/core/skbuff.c:766:32: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat] level, sk->sk_family, sk->sk_type, sk->sk_protocol); ^~~~~~~~~~~ net/core/skbuff.c:766:45: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat] level, sk->sk_family, sk->sk_type, sk->sk_protocol); ^~~~~~~~~~~~~~~ Fix them by using the proper types. Fixes: 6413139dfc64 ("skbuff: increase verbosity when dumping skb data") Signed-off-by: Qian Cai <cai@lca.pw> --- v2: Drop the checkpatch fix as it seems a bit more involved that it does not even like passing a variable to it, i.e., printk(level "msg"). Also, print_hex_dump() seems need a fix to be complete which can probably be done later. net/core/skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)