Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / net / tipc / msg.h

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 35d5ba1d4f42b54bb10bcacd64d5fb20f9bc5226..ce2659836374c8341d597bfc43d8dcbacf2b3dcf 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -72,10 +72,8 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
                                u32 pos, u32 mask, u32 val)
 {
        val = (val & mask) << pos;
-       val = htonl(val);
-       mask = htonl(mask << pos);
-       m->hdr[w] &= ~mask;
-       m->hdr[w] |= val;
+       m->hdr[w] &= ~htonl(mask << pos);
+       m->hdr[w] |= htonl(val);
 }
 
 /*