Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d869dea6 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

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: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72a338bc

include/net/tipc.h

+2 −2
Original line number Diff line number Diff line
@@ -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))

net/core/flow_dissector.c

+1 −1
Original line number Diff line number Diff line
@@ -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));