Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[firefly-linux-kernel-4.4.55.git] / net / tipc / msg.c

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 03e57bf92c732b8d278fbf1bcfb0491b23f6ac34..83d50967910c6a61bf276742aeee957959796406 100644 (file)
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -61,10 +61,8 @@ void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type,
        msg_set_size(m, hsize);
        msg_set_prevnode(m, tipc_own_addr);
        msg_set_type(m, type);
-       if (!msg_short(m)) {
-               msg_set_orignode(m, tipc_own_addr);
-               msg_set_destnode(m, destnode);
-       }
+       msg_set_orignode(m, tipc_own_addr);
+       msg_set_destnode(m, destnode);
 }
 
 /**