diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:42:26 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:23:40 -0500 |
commit | 5c78f275e696a25a9919671aa8aa3d0a3d967978 (patch) | |
tree | 5bc47f99809697150ca2a2c98a9618f28255a869 /include/net/dsfield.h | |
parent | f6ab028804bdc580fe0915494dbf31f5ea473ca7 (diff) |
[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.h | 4 |
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) | |||
27 | static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask, | 27 | static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask, |
28 | __u8 value) | 28 | __u8 value) |
29 | { | 29 | { |
30 | __u32 check = ntohs(iph->check); | 30 | __u32 check = ntohs((__force __be16)iph->check); |
31 | __u8 dsfield; | 31 | __u8 dsfield; |
32 | 32 | ||
33 | dsfield = (iph->tos & mask) | value; | 33 | dsfield = (iph->tos & mask) | value; |
@@ -35,7 +35,7 @@ static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask, | |||
35 | if ((check+1) >> 16) check = (check+1) & 0xffff; | 35 | if ((check+1) >> 16) check = (check+1) & 0xffff; |
36 | check -= dsfield; | 36 | check -= dsfield; |
37 | check += check >> 16; /* adjust carry */ | 37 | check += check >> 16; /* adjust carry */ |
38 | iph->check = htons(check); | 38 | iph->check = (__force __sum16)htons(check); |
39 | iph->tos = dsfield; | 39 | iph->tos = dsfield; |
40 | } | 40 | } |
41 | 41 | ||