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>
This commit is contained in:
Allan Stephens 2011-02-28 10:56:23 -05:00 committed by Paul Gortmaker
parent a728750e4f
commit fa2bae2d5b
1 changed files with 9 additions and 7 deletions

View File

@ -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 */ /* Accept discovery message & send response, if necessary */
link_fully_up = link_working_working(link); link_fully_up = link_working_working(link);
tipc_node_unlock(n_ptr);
if ((type == DSC_RESP_MSG) || link_fully_up) if ((type == DSC_REQ_MSG) && !link_fully_up) {
return; rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr);
rbuf = tipc_disc_init_msg(DSC_RESP_MSG, orig, b_ptr); if (rbuf) {
if (rbuf != NULL) { b_ptr->media->send_msg(rbuf, b_ptr, &media_addr);
b_ptr->media->send_msg(rbuf, b_ptr, &media_addr); buf_discard(rbuf);
buf_discard(rbuf); }
} }
tipc_node_unlock(n_ptr);
} }
/** /**