tipc: Enhance sending of discovery object link request messages

Augments TIPC's discovery object to send its initial neighbor discovery
request message as soon as the associated bearer is created, rather than
waiting for its first periodic timeout to occur, thereby speeding up the
discovery process. Also adds a check to suppress the initial request or
subsequent requests if the bearer is blocked at the time the request is
scheduled for transmission.

Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index 6acf32a9eef8bedb03cd3ba16d7cfbf726ce3fb4..dba47673124dd7a9a34817c4501692078014be5c 100644 (file)
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -240,6 +240,17 @@ void tipc_disc_update_link_req(struct link_req *req)
        }
 }
 
+/**
+ * disc_send_msg - send link setup request message
+ * @req: ptr to link request structure
+ */
+
+static void disc_send_msg(struct link_req *req)
+{
+       if (!req->bearer->blocked)
+               tipc_bearer_send(req->bearer, req->buf, &req->dest);
+}
+
 /**
  * disc_timeout - send a periodic link setup request
  * @req: ptr to link request structure
@@ -251,7 +262,7 @@ static void disc_timeout(struct link_req *req)
 {
        spin_lock_bh(&req->bearer->lock);
 
-       req->bearer->media->send_msg(req->buf, req->bearer, &req->dest);
+       disc_send_msg(req);
 
        if ((req->timer_intv == TIPC_LINK_REQ_SLOW) ||
            (req->timer_intv == TIPC_LINK_REQ_FAST)) {
@@ -300,6 +311,7 @@ int tipc_disc_create(struct tipc_bearer *b_ptr,
        k_init_timer(&req->timer, (Handler)disc_timeout, (unsigned long)req);
        k_start_timer(&req->timer, req->timer_intv);
        b_ptr->link_req = req;
+       disc_send_msg(req);
        return 0;
 }