Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
b70e4f45
Commit
b70e4f45
authored
Jan 10, 2006
by
Jon Maloy
Committed by
David S. Miller
Jan 12, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TIPC} Fixed bug in disc_timeout()
Signed-off-by:
Jon Maloy
<
jon.maloy@ericsson.com
>
parent
1dba9743
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
27 deletions
+5
-27
net/tipc/discover.c
net/tipc/discover.c
+2
-26
net/tipc/netlink.c
net/tipc/netlink.c
+3
-1
No files found.
net/tipc/discover.c
View file @
b70e4f45
...
...
@@ -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
;
...
...
net/tipc/netlink.c
View file @
b70e4f45
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment