diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-26 22:42:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-27 14:26:49 -0700 |
| commit | becf3da20eca82e06607b9813cc3b592b359bae5 (patch) | |
| tree | 89693ca2c5739deb61dceed36f129c77dfed5b0f /net/tipc/msg.h | |
| parent | ec6b486fa9f6d20bfbaebba1db88bfe9d390ab1a (diff) | |
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.h | 7 |
1 files changed, 3 insertions, 4 deletions
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); } /* |