summaryrefslogtreecommitdiffstats
path: root/include/net/dsfield.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 00:24:26 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:21:19 -0800
commit8a9ae2110baf39b2dc53c2891e0705895a8829a9 (patch)
tree7aa4f6bd5b64e5844449fcb10127e943aee4f7ab /include/net/dsfield.h
parent5d36b1803d875cf101fdb972ff9c56663e508e39 (diff)
downloadlinux-8a9ae2110baf39b2dc53c2891e0705895a8829a9.tar.gz
linux-8a9ae2110baf39b2dc53c2891e0705895a8829a9.tar.bz2
linux-8a9ae2110baf39b2dc53c2891e0705895a8829a9.zip
[NET]: annotate dsfield.h
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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/dsfield.h b/include/net/dsfield.h
index a79c9e075f7f..dae8453385b6 100644
--- a/include/net/dsfield.h
+++ b/include/net/dsfield.h
@@ -20,7 +20,7 @@ static inline __u8 ipv4_get_dsfield(struct iphdr *iph)
static inline __u8 ipv6_get_dsfield(struct ipv6hdr *ipv6h)
{
- return ntohs(*(__u16 *) ipv6h) >> 4;
+ return ntohs(*(__be16 *) ipv6h) >> 4;
}
@@ -45,9 +45,9 @@ static inline void ipv6_change_dsfield(struct ipv6hdr *ipv6h,__u8 mask,
{
__u16 tmp;
- tmp = ntohs(*(__u16 *) ipv6h);
+ tmp = ntohs(*(__be16 *) ipv6h);
tmp = (tmp & ((mask << 4) | 0xf00f)) | (value << 4);
- *(__u16 *) ipv6h = htons(tmp);
+ *(__be16 *) ipv6h = htons(tmp);
}