From 9fdf993cb4956ce3d7b4b21e8006e1d22f8d8363 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Wed, 1 Jun 2011 15:48:42 -0400 Subject: [PATCH] --- yaml --- r: 255927 b: refs/heads/master c: f55b564054e35dcd171e1191a477327528271f95 h: refs/heads/master i: 255925: 77a33244bbb43d5414be05fee33bcd24aaabcc9f 255923: 772e163a7525c30ab3e786817affb3fd2d4903e3 255919: e53b9281547c152bcc327c27142c40e5ab6f08d4 v: v3 --- [refs] | 2 +- trunk/net/tipc/port.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 41f2a9a53176..d906615cf880 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c1a551acb8b65f842824900b283a96462f907ab +refs/heads/master: f55b564054e35dcd171e1191a477327528271f95 diff --git a/trunk/net/tipc/port.c b/trunk/net/tipc/port.c index 1b20b963a2fc..ab0a8e97e315 100644 --- a/trunk/net/tipc/port.c +++ b/trunk/net/tipc/port.c @@ -539,14 +539,15 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf) if (!p_ptr || !p_ptr->connected || (port_peernode(p_ptr) != orignode) || (port_peerport(p_ptr) != origport)) { - r_buf = port_build_proto_msg(origport, - orignode, - destport, - tipc_own_addr, - TIPC_HIGH_IMPORTANCE, - TIPC_CONN_MSG, - TIPC_ERR_NO_PORT, - 0); + r_buf = tipc_buf_acquire(BASIC_H_SIZE); + if (r_buf) { + msg = buf_msg(r_buf); + tipc_msg_init(msg, TIPC_HIGH_IMPORTANCE, TIPC_CONN_MSG, + BASIC_H_SIZE, orignode); + msg_set_errcode(msg, TIPC_ERR_NO_PORT); + msg_set_origport(msg, destport); + msg_set_destport(msg, origport); + } if (p_ptr) tipc_port_unlock(p_ptr); goto exit;