Skip to contentSkip to conversation

Patch "arch/powerpc: Update parameters for csum_tcpudp_magic & csum_tcpudp_nofold" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Nov 10, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

arch/powerpc: Update parameters for csum_tcpudp_magic & csum_tcpudp_nofold

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arch-powerpc-update-parameters-for-csum_tcpudp_magic-csum_tcpudp_nofold.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Nov 10 16:43:03 CET 2016

From: Ivan Vecera <[email protected]>
Date: Thu, 27 Oct 2016 16:30:06 +0200
Subject: arch/powerpc: Update parameters for csum_tcpudp_magic & csum_tcpudp_nofold

From: Ivan Vecera <[email protected]>

[ Upstream commit f9d4286b9516b02e795214412d36885f572b57ad ]

Commit 01cfbad "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 01cfbad "ipv4: Update parameters for csum_tcpudp_magic to their original types"
Cc Alexander Duyck <[email protected]>
---
 arch/powerpc/include/asm/checksum.h |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/checksum.h +4 -8
@@ -53,10 +53,8 @@ static inline __sum16 csum_fold(__wsum s
 	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(
  * 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));
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/arch-powerpc-update-parameters-for-csum_tcpudp_magic-csum_tcpudp_nofold.patch