Commit b70e4f45 authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller
Browse files

[TIPC} Fixed bug in disc_timeout()


Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
parent 1dba9743
...@@ -258,32 +258,8 @@ void disc_update_link_req(struct link_req *req) ...@@ -258,32 +258,8 @@ void disc_update_link_req(struct link_req *req)
static void disc_timeout(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); 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); req->bearer->media->send_msg(req->buf, &req->bearer->publ, &req->dest);
if ((req->timer_intv == TIPC_LINK_REQ_SLOW) || if ((req->timer_intv == TIPC_LINK_REQ_SLOW) ||
...@@ -291,8 +267,8 @@ static void disc_timeout(struct link_req *req) ...@@ -291,8 +267,8 @@ static void disc_timeout(struct link_req *req)
/* leave timer interval "as is" if already at a "normal" rate */ /* leave timer interval "as is" if already at a "normal" rate */
} else { } else {
req->timer_intv *= 2; req->timer_intv *= 2;
if (req->timer_intv > TIPC_LINK_REQ_FAST) if (req->timer_intv > TIPC_LINK_REQ_SLOW)
req->timer_intv = TIPC_LINK_REQ_FAST; req->timer_intv = TIPC_LINK_REQ_SLOW;
if ((req->timer_intv == TIPC_LINK_REQ_FAST) && if ((req->timer_intv == TIPC_LINK_REQ_FAST) &&
(req->bearer->nodes.count)) (req->bearer->nodes.count))
req->timer_intv = TIPC_LINK_REQ_SLOW; req->timer_intv = TIPC_LINK_REQ_SLOW;
......
...@@ -80,6 +80,8 @@ static int family_registered = 0; ...@@ -80,6 +80,8 @@ static int family_registered = 0;
int netlink_start(void) int netlink_start(void)
{ {
if (genl_register_family(&family)) if (genl_register_family(&family))
goto err; goto err;
...@@ -88,7 +90,7 @@ int netlink_start(void) ...@@ -88,7 +90,7 @@ int netlink_start(void)
if (genl_register_ops(&family, &ops)) if (genl_register_ops(&family, &ops))
goto err_unregister; goto err_unregister;
return 0; return 0;
err_unregister: err_unregister:
genl_unregister_family(&family); genl_unregister_family(&family);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment