Merge tag 'arc-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[sfrench/cifs-2.6.git] / lib / checksum.c

diff --git a/lib/checksum.c b/lib/checksum.c
index 8b39e86dbab5ea2a1afad17f6a15368f846916d6..d3ec93f9e5f3e61900c8268c883010433a08f567 100644 (file)
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -191,9 +191,7 @@ static inline u32 from64to32(u64 x)
 }
 
 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
-                       unsigned short len,
-                       unsigned short proto,
-                       __wsum sum)
+                         __u32 len, __u8 proto, __wsum sum)
 {
        unsigned long long s = (__force u32)sum;