lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

Browse Source 
Pull arch/metag fixes from James Hogan:
 "This is just a single fix to fix bad UDP checksums sometimes being
  generated to IP addresses *.*.255.255"

* tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: checksum.h: fix carry in csum_tcpudp_nofold
This commit is contained in:
Linus Torvalds
2013-07-10 10:14:35 -07:00
parent 49283f6020 d903bca9bc
commit 2d6244b3cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/metag/include/asm/checksum.h
View File

@@ -64,7 +64,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
__wsum sum) __wsum sum)
{ {
unsigned long len_proto = (proto + len) << 8; unsigned long len_proto = (proto + len) << 8;
asm ("ADD %0, %0, %1\n" asm ("ADDS %0, %0, %1\n"
"ADDCS %0, %0, #1\n"
"ADDS %0, %0, %2\n" "ADDS %0, %0, %2\n"
"ADDCS %0, %0, #1\n" "ADDCS %0, %0, #1\n"
"ADDS %0, %0, %3\n" "ADDS %0, %0, %3\n"