summaryrefslogtreecommitdiffstats
path: root/net/tipc/port.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2010-09-03 08:33:39 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-06 18:12:56 -0700
commit5d9c54c1e9ececcf7e99c4f014f9bec7ee3a7def (patch)
treeb901d720e08c5762a0bd52b404393bb8532a6a15 /net/tipc/port.c
parentdcfc5d787a24b9a20be3e18e3dbbab5280d35e38 (diff)
downloadop-kernel-dev-5d9c54c1e9ececcf7e99c4f014f9bec7ee3a7def.zip
op-kernel-dev-5d9c54c1e9ececcf7e99c4f014f9bec7ee3a7def.tar.gz
tipc: Minor optimizations to name table translation code
Optimizes TIPC's name table translation code to avoid unnecessary manipulation of the node address field of the resulting port id when name translation fails. This change is possible because a valid port id cannot have a reference field of zero, so examining the reference only is sufficient to determine if the translation was successful. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/port.c')
-rw-r--r--net/tipc/port.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/port.c b/net/tipc/port.c
index ebcbc21..d760336 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -1464,7 +1464,7 @@ int tipc_forward2name(u32 ref,
msg_set_destnode(msg, destnode);
msg_set_destport(msg, destport);
- if (likely(destport || destnode)) {
+ if (likely(destport)) {
p_ptr->sent++;
if (likely(destnode == tipc_own_addr))
return tipc_port_recv_sections(p_ptr, num_sect, msg_sect);
@@ -1542,7 +1542,7 @@ int tipc_forward_buf2name(u32 ref,
skb_push(buf, LONG_H_SIZE);
skb_copy_to_linear_data(buf, msg, LONG_H_SIZE);
msg_dbg(buf_msg(buf),"PREP:");
- if (likely(destport || destnode)) {
+ if (likely(destport)) {
p_ptr->sent++;
if (destnode == tipc_own_addr)
return tipc_port_recv_msg(buf);
OpenPOWER on IntegriCloud