diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-07-26 12:33:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 14:11:56 -0400 |
commit | 582ee43dad8e411513a74f2d801255dcffc6d29e (patch) | |
tree | bf822fd3dd9b889531134c7004e9f42b134485f1 /net/tipc | |
parent | 704eae1f32274c0435f7f3924077afdb811edd1d (diff) |
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')
-rw-r--r-- | net/tipc/msg.h | 6 |
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, | |||
72 | u32 pos, u32 mask, u32 val) | 72 | u32 pos, u32 mask, u32 val) |
73 | { | 73 | { |
74 | val = (val & mask) << pos; | 74 | val = (val & mask) << pos; |
75 | val = htonl(val); | 75 | m->hdr[w] &= ~htonl(mask << pos); |
76 | mask = htonl(mask << pos); | 76 | m->hdr[w] |= htonl(val); |
77 | m->hdr[w] &= ~mask; | ||
78 | m->hdr[w] |= val; | ||
79 | } | 77 | } |
80 | 78 | ||
81 | /* | 79 | /* |