Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / tipc / msg.h

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6574aab11fa4d0de107b6aa8a811c02b28ff7030..6699aaf7bd4cdefa305ef8eb95d19fc5ed987241 100644 (file)
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -805,14 +805,14 @@ static inline int msg_build(struct tipc_msg *hdr,
        return -EFAULT;
 }
 
+static inline void msg_set_media_addr(struct tipc_msg *m, struct tipc_media_addr *a)
+{
+       memcpy(&((int *)m)[5], a, sizeof(*a));
+}
 
-struct tipc_media_addr;
-
-extern void msg_set_media_addr(struct tipc_msg *m,
-                              struct tipc_media_addr *a);
-
-extern void msg_get_media_addr(struct tipc_msg *m,
-                              struct tipc_media_addr *a);
-
+static inline void msg_get_media_addr(struct tipc_msg *m, struct tipc_media_addr *a)
+{
+       memcpy(a, &((int*)m)[5], sizeof(*a));
+}
 
 #endif