From: Jon Maloy <jon.maloy@ericsson.com>
Date: Tue, 10 Jan 2006 18:54:24 +0000 (+0000)
Subject: [TIPC} Fixed bug in disc_timeout()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b70e4f45a8d8125e4f420c62e71688b8a766689a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

[TIPC} Fixed bug in disc_timeout()

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
---

diff --git a/net/tipc/discover.c b/net/tipc/discover.c
index c83c1be17f85..73e151cf2a51 100644
--- a/net/tipc/discover.c
+++ b/net/tipc/discover.c
@@ -258,32 +258,8 @@ void disc_update_link_req(struct link_req *req)
 
 static void disc_timeout(struct link_req *req) 
 {
-	struct tipc_msg *msg = buf_msg(req->buf);
-
 	spin_lock_bh(&req->bearer->publ.lock);
 
-#if 0
-	/* CURRENTLY DON'T SUPPORT INTER-ZONE LINKS */
-	u32 dest_domain = msg_dest_domain(msg);
-	int stop = 0;
-	if (!in_scope(dest_domain, tipc_own_addr)) {
-		struct _zone *z_ptr = zone_find(dest_domain);
-
-		if (z_ptr && (z_ptr->links >= msg_req_links(msg)))
-			stop = 1;
-		if (req->timer_intv >= 32000)
-			stop = 1;
-	}
-	if (stop) {
-		k_cancel_timer(&req->timer);
-		buf_discard(req->buf);
-		kfree(req);
-		spin_unlock_bh(&req->bearer->publ.lock);
-		return;
-	}
-#endif
-
-	msg_dbg(msg,"SEND:");
 	req->bearer->media->send_msg(req->buf, &req->bearer->publ, &req->dest);
 
 	if ((req->timer_intv == TIPC_LINK_REQ_SLOW) ||
@@ -291,8 +267,8 @@ static void disc_timeout(struct link_req *req)
 		/* leave timer interval "as is" if already at a "normal" rate */
 	} else {
 		req->timer_intv *= 2;
-		if (req->timer_intv > TIPC_LINK_REQ_FAST)
-			req->timer_intv = TIPC_LINK_REQ_FAST;
+		if (req->timer_intv > TIPC_LINK_REQ_SLOW)
+			req->timer_intv = TIPC_LINK_REQ_SLOW;
 		if ((req->timer_intv == TIPC_LINK_REQ_FAST) && 
 		    (req->bearer->nodes.count))
 			req->timer_intv = TIPC_LINK_REQ_SLOW;
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 08b974ed9109..2d778dfc4492 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -80,6 +80,8 @@ static int family_registered = 0;
 
 int netlink_start(void)
 {
+
+
 	if (genl_register_family(&family))
 		goto err;
 
@@ -88,7 +90,7 @@ int netlink_start(void)
 	if (genl_register_ops(&family, &ops))
 		goto err_unregister;
 
-	return 0;
+        return 0;
 
  err_unregister:
 	genl_unregister_family(&family);