diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 21:14:35 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 21:14:35 +0400 |
| commit | 2d6244b3cc936c35101171dab0aa9123e96f800c (patch) | |
| tree | b35438219b5cbd325c3f2661f2a145ca855537bd /arch | |
| parent | 49283f602039e3b81930c4ab5cc20e310b84c7ff (diff) | |
| parent | d903bca9bc542bd6d60019f9f761be15ad79c956 (diff) | |
| download | linux-2d6244b3cc936c35101171dab0aa9123e96f800c.tar.xz | |
Merge tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/metag/include/asm/checksum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/metag/include/asm/checksum.h b/arch/metag/include/asm/checksum.h index 999bf761a732..08dd1cc65799 100644 --- a/arch/metag/include/asm/checksum.h +++ b/arch/metag/include/asm/checksum.h @@ -64,7 +64,8 @@ static inline __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, __wsum sum) { 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" "ADDCS %0, %0, #1\n" "ADDS %0, %0, %3\n" |