projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-cris
/
checksum.h
diff --git
a/include/asm-cris/checksum.h
b/include/asm-cris/checksum.h
index 180dbf2757b0a87c8ec0ec2ad7a1481ee3f5a5ea..c6c5be62c6981aadf552a1d8dadf54b4a3012d1c 100644
(file)
--- a/
include/asm-cris/checksum.h
+++ b/
include/asm-cris/checksum.h
@@
-62,7
+62,7
@@
static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
* returns a 16-bit checksum, already complemented
*/
-static inline __sum16
int
csum_tcpudp_magic(__be32 saddr, __be32 daddr,
+static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
unsigned short len,
unsigned short proto,
__wsum sum)