tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 2d6244b3 49283f60

+2 -1
+2 -1
arch/metag/include/asm/checksum.h
··· 64 64 __wsum sum) 65 65 { 66 66 unsigned long len_proto = (proto + len) << 8; 67 - asm ("ADD %0, %0, %1\n" 67 + asm ("ADDS %0, %0, %1\n" 68 + "ADDCS %0, %0, #1\n" 68 69 "ADDS %0, %0, %2\n" 69 70 "ADDCS %0, %0, #1\n" 70 71 "ADDS %0, %0, %3\n"