diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /arch/um | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/sysdep-i386/checksum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/sysdep-i386/checksum.h index 764ba4db4788..7d3d202d7fff 100644 --- a/arch/um/include/sysdep-i386/checksum.h +++ b/arch/um/include/sysdep-i386/checksum.h | |||
| @@ -36,7 +36,7 @@ unsigned int csum_partial_copy_nocheck(const unsigned char *src, unsigned char * | |||
| 36 | int len, int sum) | 36 | int len, int sum) |
| 37 | { | 37 | { |
| 38 | memcpy(dst, src, len); | 38 | memcpy(dst, src, len); |
| 39 | return(csum_partial(dst, len, sum)); | 39 | return csum_partial(dst, len, sum); |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | /* | 42 | /* |
| @@ -104,7 +104,7 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, | |||
| 104 | : "=r" (sum), "=r" (iph), "=r" (ihl) | 104 | : "=r" (sum), "=r" (iph), "=r" (ihl) |
| 105 | : "1" (iph), "2" (ihl) | 105 | : "1" (iph), "2" (ihl) |
| 106 | : "memory"); | 106 | : "memory"); |
| 107 | return(sum); | 107 | return sum; |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | /* | 110 | /* |