summaryrefslogtreecommitdiff
path: root/include/net/dsfield.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 08:42:26 +0300
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 08:23:40 +0300
commit5c78f275e696a25a9919671aa8aa3d0a3d967978 (patch)
tree5bc47f99809697150ca2a2c98a9618f28255a869 /include/net/dsfield.h
parentf6ab028804bdc580fe0915494dbf31f5ea473ca7 (diff)
downloadlinux-5c78f275e696a25a9919671aa8aa3d0a3d967978.tar.xz
[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/dsfield.h')
-rw-r--r--include/net/dsfield.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/dsfield.h b/include/net/dsfield.h
index dae8453385b6..eb65bf2e2502 100644
--- a/include/net/dsfield.h
+++ b/include/net/dsfield.h
@@ -27,7 +27,7 @@ static inline __u8 ipv6_get_dsfield(struct ipv6hdr *ipv6h)
static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask,
__u8 value)
{
- __u32 check = ntohs(iph->check);
+ __u32 check = ntohs((__force __be16)iph->check);
__u8 dsfield;
dsfield = (iph->tos & mask) | value;
@@ -35,7 +35,7 @@ static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask,
if ((check+1) >> 16) check = (check+1) & 0xffff;
check -= dsfield;
check += check >> 16; /* adjust carry */
- iph->check = htons(check);
+ iph->check = (__force __sum16)htons(check);
iph->tos = dsfield;
}