From 772e163a7525c30ab3e786817affb3fd2d4903e3 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 31 May 2011 14:35:18 -0400 Subject: [PATCH] --- yaml --- r: 255923 b: refs/heads/master c: 15f4e2b30372695573bc46102790094a92b3eb11 h: refs/heads/master i: 255921: 086cf2391ef9e17294fc1828de8594990a4cb398 255919: e53b9281547c152bcc327c27142c40e5ab6f08d4 v: v3 --- [refs] | 2 +- trunk/net/tipc/msg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) 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); } /**