aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/port.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-11-07 17:00:54 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-02-24 17:05:17 -0500
commitbc9f8143ecf96c17a56635d2ef4c3c6b6ec27947 (patch)
tree7fad37cb7c78e88cba4b59aba374194cead93f56 /net/tipc/port.c
parent75aba9af2410ae8fc70600d9dcda0651f20e091e (diff)
tipc: Revert name table translation optimization
Restores name table translation using a non-zero domain that is "out of scope", which was broken by an earlier commit (5d9c54c1e9ececcf7e99c4f014f9bec7ee3a7def). Comments have now been added to the name table translation routine to make it clear that there are actually three possible outcomes to a translation request (found/not found/deferred), rather than just two (found/not found). Note that a straightforward revert of the earlier commit is not possible, as other changes to the name table translation logic have occurred since the incorrect optimization was made. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/port.c')
-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 c4b5a347037a..b103d7630c82 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -1221,7 +1221,7 @@ int tipc_send2name(u32 ref, struct tipc_name const *name, unsigned int domain,
1221 msg_set_destnode(msg, destnode); 1221 msg_set_destnode(msg, destnode);
1222 msg_set_destport(msg, destport); 1222 msg_set_destport(msg, destport);
1223 1223
1224 if (likely(destport)) { 1224 if (likely(destport || destnode)) {
1225 if (likely(destnode == tipc_own_addr)) 1225 if (likely(destnode == tipc_own_addr))
1226 res = tipc_port_recv_sections(p_ptr, num_sect, 1226 res = tipc_port_recv_sections(p_ptr, num_sect,
1227 msg_sect, total_len); 1227 msg_sect, total_len);