commit | 582ee43dad8e411513a74f2d801255dcffc6d29e | [log] [tgz] |
---|---|---|
author | Al Viro <viro@ftp.linux.org.uk> | Thu Jul 26 17:33:39 2007 +0100 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jul 26 11:11:56 2007 -0700 |
tree | bf822fd3dd9b889531134c7004e9f42b134485f1 | |
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>
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 35d5ba1..ce26598 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h
@@ -72,10 +72,8 @@ 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); } /*