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

Commit f9d4286b authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

arch/powerpc: Update parameters for csum_tcpudp_magic & csum_tcpudp_nofold 



Commit 01cfbad7 "ipv4: Update parameters for csum_tcpudp_magic to their
original types" changed parameters for csum_tcpudp_magic and
csum_tcpudp_nofold for many platforms but not for PowerPC.

Fixes: 01cfbad7 "ipv4: Update parameters for csum_tcpudp_magic to their original types"
Cc: Alexander Duyck <aduyck@mirantis.com>
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Acked-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e59cc767

arch/powerpc/include/asm/checksum.h

+4 −8
Original line number Diff line number Diff line
@@ -53,10 +53,8 @@ static inline __sum16 csum_fold(__wsum sum) 
	return (__force __sum16)(~((__force u32)sum + tmp) >> 16);

}



static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,

                                     unsigned short len,

                                     unsigned short proto,

                                     __wsum sum)

static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __u32 len,

					__u8 proto, __wsum sum)

{

#ifdef __powerpc64__

	unsigned long s = (__force u32)sum;
@@ -83,10 +81,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, 
 * computes the checksum of the TCP/UDP pseudo-header

 * returns a 16-bit checksum, already complemented

 */

static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,

					unsigned short len,

					unsigned short proto,

					__wsum sum)

static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, __u32 len,

					__u8 proto, __wsum sum)

{

	return csum_fold(csum_tcpudp_nofold(saddr, daddr, len, proto, sum));

}