[SCSI] ibmvfc: Update driver version to 1.0.1

[linux-2.6] / include / net / tipc / tipc_msg.h

diff --git a/include/net/tipc/tipc_msg.h b/include/net/tipc/tipc_msg.h
index 4d096ee..2e159a8 100644 (file)
--- a/include/net/tipc/tipc_msg.h
+++ b/include/net/tipc/tipc_msg.h
@@ -40,7 +40,7 @@
 #ifdef __KERNEL__
 
 struct tipc_msg {
-       u32 hdr[15];
+       __be32 hdr[15];
 };
 
 
@@ -130,11 +130,6 @@ static inline u32 msg_type(struct tipc_msg *m)
        return msg_bits(m, 1, 29, 0x7);
 }
 
-static inline u32 msg_direct(struct tipc_msg *m)
-{
-       return (msg_type(m) == TIPC_DIRECT_MSG);
-}
-
 static inline u32 msg_named(struct tipc_msg *m)
 {
        return (msg_type(m) == TIPC_NAMED_MSG);
@@ -207,17 +202,6 @@ static inline u32 msg_nameupper(struct tipc_msg *m)
        return msg_word(m, 10);
 }
 
-static inline char *msg_options(struct tipc_msg *m, u32 *len)
-{
-       u32 pos = msg_bits(m, 1, 16, 0x7);
-
-       if (!pos)
-               return 0;
-       pos = (pos * 4) + 28;
-       *len = msg_hdr_sz(m) - pos;
-       return (char *)&m->hdr[pos/4];
-}
-
 #endif
 
 #endif