Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
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
Commits
f6e63cfb
Commit
f6e63cfb
authored
Oct 04, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
parents
fad1c45c
e6308be8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
net/ipv4/fib_trie.c
net/ipv4/fib_trie.c
+21
-2
net/ipv6/udp.c
net/ipv6/udp.c
+3
-1
No files found.
net/ipv4/fib_trie.c
View file @
f6e63cfb
...
...
@@ -286,6 +286,8 @@ static inline void check_tnode(const struct tnode *tn)
static
int
halve_threshold
=
25
;
static
int
inflate_threshold
=
50
;
static
int
halve_threshold_root
=
15
;
static
int
inflate_threshold_root
=
25
;
static
void
__alias_free_mem
(
struct
rcu_head
*
head
)
...
...
@@ -449,6 +451,8 @@ static struct node *resize(struct trie *t, struct tnode *tn)
int
i
;
int
err
=
0
;
struct
tnode
*
old_tn
;
int
inflate_threshold_use
;
int
halve_threshold_use
;
if
(
!
tn
)
return
NULL
;
...
...
@@ -541,10 +545,17 @@ static struct node *resize(struct trie *t, struct tnode *tn)
check_tnode
(
tn
);
/* Keep root node larger */
if
(
!
tn
->
parent
)
inflate_threshold_use
=
inflate_threshold_root
;
else
inflate_threshold_use
=
inflate_threshold
;
err
=
0
;
while
((
tn
->
full_children
>
0
&&
50
*
(
tn
->
full_children
+
tnode_child_length
(
tn
)
-
tn
->
empty_children
)
>=
inflate_threshold
*
tnode_child_length
(
tn
)))
{
inflate_threshold
_use
*
tnode_child_length
(
tn
)))
{
old_tn
=
tn
;
tn
=
inflate
(
t
,
tn
);
...
...
@@ -564,10 +575,18 @@ static struct node *resize(struct trie *t, struct tnode *tn)
* node is above threshold.
*/
/* Keep root node larger */
if
(
!
tn
->
parent
)
halve_threshold_use
=
halve_threshold_root
;
else
halve_threshold_use
=
halve_threshold
;
err
=
0
;
while
(
tn
->
bits
>
1
&&
100
*
(
tnode_child_length
(
tn
)
-
tn
->
empty_children
)
<
halve_threshold
*
tnode_child_length
(
tn
))
{
halve_threshold
_use
*
tnode_child_length
(
tn
))
{
old_tn
=
tn
;
tn
=
halve
(
t
,
tn
);
...
...
net/ipv6/udp.c
View file @
f6e63cfb
...
...
@@ -99,7 +99,7 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
next:
;
}
result
=
best
;
for
(
;;
result
+=
UDP_HTABLE_SIZE
)
{
for
(
i
=
0
;
i
<
(
1
<<
16
)
/
UDP_HTABLE_SIZE
;
i
++
,
result
+=
UDP_HTABLE_SIZE
)
{
if
(
result
>
sysctl_local_port_range
[
1
])
result
=
sysctl_local_port_range
[
0
]
+
((
result
-
sysctl_local_port_range
[
0
])
&
...
...
@@ -107,6 +107,8 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum)
if
(
!
udp_lport_inuse
(
result
))
break
;
}
if
(
i
>=
(
1
<<
16
)
/
UDP_HTABLE_SIZE
)
goto
fail
;
gotit:
udp_port_rover
=
snum
=
result
;
}
else
{
...
...
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