Skip to content

Commit

Permalink
tipc: Give Tx of discovery responses priority over link messages
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Allan Stephens authored and Paul Gortmaker committed Mar 13, 2011
1 parent a728750 commit fa2bae2
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions net/tipc/discover.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down

0 comments on commit fa2bae2

Please sign in to comment.