]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
tipc: Ensure network address change doesn't impact rejected message
authorAllan Stephens <allan.stephens@windriver.com>
Wed, 18 Apr 2012 13:42:29 +0000 (09:42 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 19 Apr 2012 19:46:49 +0000 (15:46 -0400)
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>
net/tipc/port.c

index c50819bc109ac7957e35f6792c8eb23472a9ac77..0f40b1055306d1a47dcdda6b0ae0fb1cb730b6d0 100644 (file)
@@ -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));