---

yaml --- r: 90048 b: refs/heads/master c: c0cb7ef h: refs/heads/master v: v3
git-mirror · Mar 6, 2008 · 12d2ff9 · 12d2ff9
1 parent 946850e
commit 12d2ff9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37695420a233aa8aef40c68cb338ad09e0241ec3
+refs/heads/master: c0cb7ef08667374f0cbe8c94c819f74a6c935135
diff --git a/trunk/net/tipc/msg.h b/trunk/net/tipc/msg.h
@@ -70,8 +70,10 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
 				u32 pos, u32 mask, u32 val)
 {
 	val = (val & mask) << pos;
-	m->hdr[w] &= ~htonl(mask << pos);
-	m->hdr[w] |= htonl(val);
+	val = htonl(val);
+	mask = htonl(mask << pos);
+	m->hdr[w] &= ~mask;
+	m->hdr[w] |= val;
 }
 
 /*