diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 21:42:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:23:40 -0800 |
| commit | 5c78f275e696a25a9919671aa8aa3d0a3d967978 (patch) | |
| tree | 5bc47f99809697150ca2a2c98a9618f28255a869 /include/net/inet_ecn.h | |
| parent | f6ab028804bdc580fe0915494dbf31f5ea473ca7 (diff) | |
| download | kernel_samsung_aries-5c78f275e696a25a9919671aa8aa3d0a3d967978.zip kernel_samsung_aries-5c78f275e696a25a9919671aa8aa3d0a3d967978.tar.gz kernel_samsung_aries-5c78f275e696a25a9919671aa8aa3d0a3d967978.tar.bz2 | |
[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/inet_ecn.h')
| -rw-r--r-- | include/net/inet_ecn.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h index cadc0ea..10117c8 100644 --- a/include/net/inet_ecn.h +++ b/include/net/inet_ecn.h @@ -53,7 +53,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner) static inline int IP_ECN_set_ce(struct iphdr *iph) { - u32 check = iph->check; + u32 check = (__force u32)iph->check; u32 ecn = (iph->tos + 1) & INET_ECN_MASK; /* @@ -71,9 +71,9 @@ static inline int IP_ECN_set_ce(struct iphdr *iph) * INET_ECN_ECT_1 => check += htons(0xFFFD) * INET_ECN_ECT_0 => check += htons(0xFFFE) */ - check += htons(0xFFFB) + htons(ecn); + check += (__force u16)htons(0xFFFB) + (__force u16)htons(ecn); - iph->check = check + (check>=0xFFFF); + iph->check = (__force __sum16)(check + (check>=0xFFFF)); iph->tos |= INET_ECN_CE; return 1; } |