summaryrefslogtreecommitdiffstats
path: root/include/net/ip.h
diff options
context:
space:
mode:
authorAl Viro2006-11-15 06:42:26 +0100
committerDavid S. Miller2006-12-03 06:23:40 +0100
commit5c78f275e696a25a9919671aa8aa3d0a3d967978 (patch)
tree5bc47f99809697150ca2a2c98a9618f28255a869 /include/net/ip.h
parent[NET]: Make mangling a checksum (0 -> 0xffff on the wire) explicit. (diff)
downloadkernel-qcow2-linux-5c78f275e696a25a9919671aa8aa3d0a3d967978.tar.gz
kernel-qcow2-linux-5c78f275e696a25a9919671aa8aa3d0a3d967978.tar.xz
kernel-qcow2-linux-5c78f275e696a25a9919671aa8aa3d0a3d967978.zip
[NET]: IP header modifier helpers annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
-rw-r--r--include/net/ip.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index eafbcaf728fd..83cb9ac5554e 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -192,9 +192,9 @@ extern void ipfrag_init(void);
static inline
int ip_decrease_ttl(struct iphdr *iph)
{
- u32 check = iph->check;
- check += htons(0x0100);
- iph->check = check + (check>=0xFFFF);
+ u32 check = (__force u32)iph->check;
+ check += (__force u32)htons(0x0100);
+ iph->check = (__force __sum16)(check + (check>=0xFFFF));
return --iph->ttl;
}