summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2011-02-28 10:56:23 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:18 -0400
commitfa2bae2d5bede252445cc457737d00f9036c41c3 (patch)
treea4f826a7716a4d3c5c14b1e5f957646e03c202f4 /net/tipc
parenta728750e4f0c9500741406299f1817022d411d33 (diff)
downloadlinux-3.10-fa2bae2d5bede252445cc457737d00f9036c41c3.tar.gz
linux-3.10-fa2bae2d5bede252445cc457737d00f9036c41c3.tar.bz2
linux-3.10-fa2bae2d5bede252445cc457737d00f9036c41c3.zip
tipc: Give Tx of discovery responses priority over link messages
Delay releasing the node lock when processing a neighbor discovery message until after the optional discovery response message has been sent. This helps ensure that any link protocol messages sent by a link endpoint created as a result of a neighbor discovery request are received after the discovery response is received, thereby giving the receiving node a chance to create a peer link endpoint to consume those link protocol messages, if one does not already exist. 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/discover.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 2345268ca64..580b50a79e4 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -201,14 +201,16 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr)
/* Accept discovery message & send response, if necessary */
link_fully_up = link_working_working(link);
- tipc_node_unlock(n_ptr);
- if ((type == DSC_RESP_MSG) || link_fully_up)
- return;
- rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr);
- if (rbuf != NULL) {
- b_ptr->media->send_msg(rbuf, b_ptr, &media_addr);
- buf_discard(rbuf);
+
+ if ((type == DSC_REQ_MSG) && !link_fully_up) {
+ rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr);
+ if (rbuf) {
+ b_ptr->media->send_msg(rbuf, b_ptr, &media_addr);
+ buf_discard(rbuf);
+ }
}
+
+ tipc_node_unlock(n_ptr);
}
/**