summaryrefslogtreecommitdiffstats
path: root/net/tipc/msg.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-04-27 07:42:14 +0200
committerDavid S. Miller <davem@davemloft.net>2008-04-27 23:26:49 +0200
commitbecf3da20eca82e06607b9813cc3b592b359bae5 (patch)
tree89693ca2c5739deb61dceed36f129c77dfed5b0f /net/tipc/msg.h
parentipv6: result of csum_fold() is already 16bit, no need to cast (diff)
downloadlinux-becf3da20eca82e06607b9813cc3b592b359bae5.tar.xz
linux-becf3da20eca82e06607b9813cc3b592b359bae5.zip
tipc: endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/msg.h')
-rw-r--r--net/tipc/msg.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6ad070d87702..ad487e8abcc2 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);
}
/*