OSDN Git Service

nfp: flower: fix size_t compile warning
authorJohn Hurley <john.hurley@netronome.com>
Thu, 18 Apr 2019 00:05:39 +0000 (01:05 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Apr 2019 18:56:40 +0000 (11:56 -0700)
A recent addition to NFP introduced a function that formats a string with
a size_t variable. This is formatted with %ld which is fine on 64-bit
architectures but produces a compile warning on 32-bit architectures.

Fix this by using the z length modifier.

Fixes: a6156a6ab0f9 ("nfp: flower: handle merge hint messages")
Signed-off-by: John Hurley <john.hurley@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/flower/cmsg.c

index 2054a2f..7faec68 100644 (file)
@@ -217,7 +217,7 @@ nfp_flower_cmsg_merge_hint_rx(struct nfp_app *app, struct sk_buff *skb)
        flow_cnt = msg->count + 1;
 
        if (msg_len < struct_size(msg, flow, flow_cnt)) {
-               nfp_flower_cmsg_warn(app, "Merge hint ctrl msg too short - %d bytes but expect %ld\n",
+               nfp_flower_cmsg_warn(app, "Merge hint ctrl msg too short - %d bytes but expect %zd\n",
                                     msg_len, struct_size(msg, flow, flow_cnt));
                return;
        }