From 53ebcea06ab83f78da75ac7470c9e9ddd5b59aeb Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Wed, 4 Jun 2008 17:48:25 -0700 Subject: [PATCH] --- yaml --- r: 102691 b: refs/heads/master c: 99c145939bc1f65f9b946f2b9dd7bfc1f44783d6 h: refs/heads/master i: 102689: 6e28deeb7b8249a1ec8775a0199301238024f262 102687: cb01e13c23654463bdd6a95eeb941cc17a0b947e v: v3 --- [refs] | 2 +- trunk/net/tipc/port.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dcde05f99a4f..d390931ddb44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bef54383d16568da19cfe46bdc52cdedb9bb8da +refs/heads/master: 99c145939bc1f65f9b946f2b9dd7bfc1f44783d6 diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c index 93014f9bc95f..2e0cff408ff9 100644 --- a/trunk/net/tipc/port.c +++ b/trunk/net/tipc/port.c @@ -448,13 +448,15 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err) msg_set_errcode(rmsg, err); msg_set_destport(rmsg, msg_origport(msg)); msg_set_origport(rmsg, msg_destport(msg)); - if (msg_short(msg)) + if (msg_short(msg)) { msg_set_orignode(rmsg, tipc_own_addr); - else + /* leave name type & instance as zeroes */ + } else { msg_set_orignode(rmsg, msg_destnode(msg)); + msg_set_nametype(rmsg, msg_nametype(msg)); + msg_set_nameinst(rmsg, msg_nameinst(msg)); + } msg_set_size(rmsg, data_sz + hdr_sz); - msg_set_nametype(rmsg, msg_nametype(msg)); - msg_set_nameinst(rmsg, msg_nameinst(msg)); skb_copy_to_linear_data_offset(rbuf, hdr_sz, msg_data(msg), data_sz); /* send self-abort message when rejecting on a connected port */