diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-cris/checksum.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-cris/checksum.h')
| -rw-r--r-- | include/asm-cris/checksum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/checksum.h b/include/asm-cris/checksum.h index 180dbf2757b0..c6c5be62c698 100644 --- a/include/asm-cris/checksum.h +++ b/include/asm-cris/checksum.h | |||
| @@ -62,7 +62,7 @@ static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl) | |||
| 62 | * returns a 16-bit checksum, already complemented | 62 | * returns a 16-bit checksum, already complemented |
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | static inline __sum16 int csum_tcpudp_magic(__be32 saddr, __be32 daddr, | 65 | static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr, |
| 66 | unsigned short len, | 66 | unsigned short len, |
| 67 | unsigned short proto, | 67 | unsigned short proto, |
| 68 | __wsum sum) | 68 | __wsum sum) |