diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /include/asm-arm/checksum.h | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'include/asm-arm/checksum.h')
| -rw-r--r-- | include/asm-arm/checksum.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-arm/checksum.h b/include/asm-arm/checksum.h index 9d048a3ba..b91f5e7f4 100644 --- a/include/asm-arm/checksum.h +++ b/include/asm-arm/checksum.h @@ -123,12 +123,14 @@ csum_tcpudp_magic(unsigned long saddr, unsigned long daddr, unsigned short len, adcs %0, %0, %3 adcs %0, %0, %4 adcs %0, %0, %5 + adc %0, %0, #0 adds %0, %0, %0, lsl #16 - addcs %0, %0, #0x10000" + addcs %0, %0, #0x10000 + mvn %0, %0" : "=&r"(sum) - : "r" (sum), "r" (daddr), "r" (saddr), "r" (ntohs(len) << 16), "Ir" (proto << 8) + : "r" (sum), "r" (daddr), "r" (saddr), "r" (ntohs(len)), "Ir" (proto << 8) : "cc"); - return (~sum) >> 16; + return sum >> 16; } |