diff --git a/[refs] b/[refs]
index f7fee7bc6864..2b7e27e0d1da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9948ba24f764694413207812d2b2dae46eb7275
+refs/heads/master: 15f4e2b30372695573bc46102790094a92b3eb11
diff --git a/trunk/net/tipc/msg.c b/trunk/net/tipc/msg.c
index 03e57bf92c73..83d50967910c 100644
--- a/trunk/net/tipc/msg.c
+++ b/trunk/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);
 }
 
 /**