[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CY4PR15MB1575AC3A70F9E9ECE1FC571F9A9B0@CY4PR15MB1575.namprd15.prod.outlook.com>
Date: Mon, 7 May 2018 13:54:37 +0000
From: Jon Maloy <jon.maloy@...csson.com>
To: Paolo Abeni <pabeni@...hat.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
CC: "David S. Miller" <davem@...emloft.net>
Subject: RE: [PATCH net-next] flow_dissector: do not rely on implicit casts
Acked-by: Jon Maloy <jon.maloy@...csson.com>
> -----Original Message-----
> From: netdev-owner@...r.kernel.org [mailto:netdev-
> owner@...r.kernel.org] On Behalf Of Paolo Abeni
> Sent: Monday, May 07, 2018 06:06
> To: netdev@...r.kernel.org
> Cc: David S. Miller <davem@...emloft.net>
> Subject: [PATCH net-next] flow_dissector: do not rely on implicit casts
>
> This change fixes a couple of type mismatch reported by the sparse tool,
> explicitly using the requested type for the offending arguments.
>
> Signed-off-by: Paolo Abeni <pabeni@...hat.com>
> ---
> include/net/tipc.h | 4 ++--
> net/core/flow_dissector.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/net/tipc.h b/include/net/tipc.h index
> 07670ec022a7..f0e7e6bc1bef 100644
> --- a/include/net/tipc.h
> +++ b/include/net/tipc.h
> @@ -44,11 +44,11 @@ struct tipc_basic_hdr {
> __be32 w[4];
> };
>
> -static inline u32 tipc_hdr_rps_key(struct tipc_basic_hdr *hdr)
> +static inline __be32 tipc_hdr_rps_key(struct tipc_basic_hdr *hdr)
> {
> u32 w0 = ntohl(hdr->w[0]);
> bool keepalive_msg = (w0 & KEEPALIVE_MSG_MASK) ==
> KEEPALIVE_MSG_MASK;
> - int key;
> + __be32 key;
>
> /* Return source node identity as key */
> if (likely(!keepalive_msg))
> diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index
> 030d4ca177fb..4fc1e84d77ec 100644
> --- a/net/core/flow_dissector.c
> +++ b/net/core/flow_dissector.c
> @@ -1316,7 +1316,7 @@ u32 skb_get_poff(const struct sk_buff *skb) {
> struct flow_keys_basic keys;
>
> - if (!skb_flow_dissect_flow_keys_basic(skb, &keys, 0, 0, 0, 0, 0))
> + if (!skb_flow_dissect_flow_keys_basic(skb, &keys, NULL, 0, 0, 0, 0))
> return 0;
>
> return __skb_get_poff(skb, skb->data, &keys, skb_headlen(skb));
> --
> 2.14.3
Powered by blists - more mailing lists