summaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2012-04-18 09:42:29 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-04-19 15:46:49 -0400
commit630d920dcae546c4e8ef6c01e7c49b2f42822c5f (patch)
tree16a2846b78b7beb4410ccd759e76b5ad44a917de /net/tipc
parent8a55fe74b1a767cb00d6248a847068c9d886d710 (diff)
downloadblackbird-op-linux-630d920dcae546c4e8ef6c01e7c49b2f42822c5f.tar.gz
blackbird-op-linux-630d920dcae546c4e8ef6c01e7c49b2f42822c5f.zip
tipc: Ensure network address change doesn't impact rejected message
Revises handling of a rejected message to ensure that a locally originated message is returned properly even if the node's network address is changed in mid-operation. The routine now treats the default node address of <0.0.0> as an alias for "this node" when determining where to send a returned message. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c
index c50819bc109a..0f40b1055306 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -444,7 +444,7 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err)
/* send returned message & dispose of rejected message */
src_node = msg_prevnode(msg);
- if (src_node == tipc_own_addr)
+ if (in_own_node(src_node))
tipc_port_recv_msg(rbuf);
else
tipc_link_send(rbuf, src_node, msg_link_selector(rmsg));
OpenPOWER on IntegriCloud