summaryrefslogtreecommitdiffstats
path: root/net/tipc/msg.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-26 18:33:39 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-26 20:11:56 +0200
commit582ee43dad8e411513a74f2d801255dcffc6d29e (patch)
treebf822fd3dd9b889531134c7004e9f42b134485f1 /net/tipc/msg.h
parentip6_tunnel - endianness annotations (diff)
downloadlinux-582ee43dad8e411513a74f2d801255dcffc6d29e.tar.xz
linux-582ee43dad8e411513a74f2d801255dcffc6d29e.zip
net/* misc endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/tipc/msg.h')
-rw-r--r--net/tipc/msg.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 35d5ba1d4f42..ce2659836374 100644
--- 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);
}
/*