From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 27 Apr 2008 05:42:14 +0000 (-0700)
Subject: tipc: endianness annotations
X-Git-Tag: v2.6.26-rc1~715^2~8
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=becf3da20eca82e06607b9813cc3b592b359bae5;p=linux-2.6-omap-h63xx.git

tipc: endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6ad070d8770..ad487e8abcc 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -70,10 +70,9 @@ 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;
+	mask = mask << pos;
+	m->hdr[w] &= ~htonl(mask);
+	m->hdr[w] |= htonl(val);
 }
 
 /*