git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
include
/
net
/
ip6_checksum.h
diff --git
a/include/net/ip6_checksum.h
b/include/net/ip6_checksum.h
index
68e2b32
..
bc1b0fd
100644
(file)
--- a/
include/net/ip6_checksum.h
+++ b/
include/net/ip6_checksum.h
@@
-87,7
+87,7
@@
static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
carry = (sum < uproto);
sum += carry;
- return csum_fold((__force __wsum)
c
sum);
+ return csum_fold((__force __wsum)sum);
}
#endif