summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-06-17 10:54:49 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-17 15:53:01 -0700
commit7410f967ba9bdc14b1e336e5d235929ed878cbfc (patch)
tree848f66440d17c545cdb04207500001fbbac9089f
parent796c75d0d3ef13cd1df00779abb8b27edb630504 (diff)
downloadop-kernel-dev-7410f967ba9bdc14b1e336e5d235929ed878cbfc.zip
op-kernel-dev-7410f967ba9bdc14b1e336e5d235929ed878cbfc.tar.gz
tipc: make tipc_link_send_sections_fast exit earlier
Once message build request function returns invalid code, the process of sending message cannot continue. So in case of message build failure, tipc_link_send_sections_fast() should return immediately. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/link.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index b6de1aa..b6ffa9f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1082,6 +1082,9 @@ again:
*/
res = tipc_msg_build(hdr, msg_sect, num_sect, total_len,
sender->max_pkt, &buf);
+ /* Exit if build request was invalid */
+ if (unlikely(res < 0))
+ return res;
read_lock_bh(&tipc_net_lock);
node = tipc_node_find(destaddr);
@@ -1098,10 +1101,6 @@ exit:
return res;
}
- /* Exit if build request was invalid */
- if (unlikely(res < 0))
- goto exit;
-
/* Exit if link (or bearer) is congested */
if (link_congested(l_ptr) ||
tipc_bearer_blocked(l_ptr->b_ptr)) {
OpenPOWER on IntegriCloud