Commit cea80ea8 authored Nov 04, 2013 by Daniel Borkmann Committed by David S. Miller Nov 04, 2013

net: checksum: fix warning in skb_checksum



This patch fixes a build warning in skb_checksum() by wrapping the
csum_partial() usage in skb_checksum(). The problem is that on a few
architectures, csum_partial is used with prefix asmlinkage whereas
on most architectures it's not. So fix this up generically as we did
with csum_block_add_ext() to match the signature. Introduced by
2817a336 ("net: skb_checksum: allow custom update/combine for
walking skb").

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 394efd19

include/net/checksum.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,11 @@ static inline __wsum csum_unfold(__sum16 n)
		return (__force __wsum)n;
		}

		static inline __wsum csum_partial_ext(const void *buff, int len, __wsum sum)
		{
		return csum_partial(buff, len, sum);
		}

		#define CSUM_MANGLED_0 ((__force __sum16)0xffff)

		static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)

net/core/skbuff.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2003,7 +2003,7 @@ __wsum skb_checksum(const struct sk_buff *skb, int offset,
		int len, __wsum csum)
		{
		const struct skb_checksum_ops ops = {
		.update = csum_partial,
		.update = csum_partial_ext,
		.combine = csum_block_add_ext,
		};

Admin message