From 0afe86d5923bcb5e34ab5ca552226598e529aa41 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 8 Nov 2006 00:24:26 -0800 Subject: [PATCH] --- yaml --- r: 41581 b: refs/heads/master c: 8a9ae2110baf39b2dc53c2891e0705895a8829a9 h: refs/heads/master i: 41579: cdd2a2eee1b2eb8cae7d52ef1841614cd6307a01 v: v3 --- [refs] | 2 +- trunk/include/net/dsfield.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3db985e926d7..2c96f65c7cf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d36b1803d875cf101fdb972ff9c56663e508e39 +refs/heads/master: 8a9ae2110baf39b2dc53c2891e0705895a8829a9 diff --git a/trunk/include/net/dsfield.h b/trunk/include/net/dsfield.h index a79c9e075f7f..dae8453385b6 100644 --- a/trunk/include/net/dsfield.h +++ b/trunk/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); }