From 12d2ff903ccd4f5301ce79c383d20646e25bb8a0 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 6 Mar 2008 15:08:10 -0800
Subject: [PATCH] --- yaml --- r: 90048 b: refs/heads/master c:
 c0cb7ef08667374f0cbe8c94c819f74a6c935135 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/tipc/msg.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 13e3349fb8aa..37458c69a5f3 100644
--- 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
index 88a2ee03bb2a..6ad070d87702 100644
--- 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;
 }
 
 /*