---

yaml --- r: 351330 b: refs/heads/master c: a0376db h: refs/heads/master v: v3
git-mirror · Jan 10, 2013 · 914965a · 914965a
1 parent 2437df9
commit 914965a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c40d100ce3311a44ef82c678fb46833a270c007
+refs/heads/master: a0376db0f234a8053100bddf26c073be79546b2b
diff --git a/trunk/include/net/dsfield.h b/trunk/include/net/dsfield.h
@@ -43,11 +43,9 @@ static inline void ipv4_change_dsfield(struct iphdr *iph,__u8 mask,
 static inline void ipv6_change_dsfield(struct ipv6hdr *ipv6h,__u8 mask,
     __u8 value)
 {
-        __u16 tmp;
+	__be16 *p = (__force __be16 *)ipv6h;
 
-	tmp = ntohs(*(__be16 *) ipv6h);
-	tmp = (tmp & ((mask << 4) | 0xf00f)) | (value << 4);
-	*(__be16 *) ipv6h = htons(tmp);
+	*p = (*p & htons((((u16)mask << 4) | 0xf00f))) | htons((u16)value << 4);
 }