Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[~andy/linux] / net / tipc / msg.h

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 35d5ba1d4f42b54bb10bcacd64d5fb20f9bc5226..e9ef6df26562c224256006f4a71733347ca354f7 100644 (file)
--- 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);
 }
 
 /*
@@ -665,11 +663,6 @@ static inline void msg_set_remote_node(struct tipc_msg *m, u32 a)
        msg_set_word(m, msg_hdr_sz(m)/4, a);
 }
 
-static inline int msg_dataoctet(struct tipc_msg *m, u32 pos)
-{
-       return(msg_data(m)[pos + 4] != 0);
-}
-
 static inline void msg_set_dataoctet(struct tipc_msg *m, u32 pos)
 {
        msg_data(m)[pos + 4] = 1;