Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux-vm
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
linux-arm
linux-vm
Commits
b6242b9b
Commit
b6242b9b
authored
13 years ago
by
David S. Miller
Browse files
Options
Downloads
Patches
Plain Diff
tcp: Remove tw->tw_peer
No longer used. Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
81166dd6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/linux/tcp.h
+0
-1
0 additions, 1 deletion
include/linux/tcp.h
net/ipv4/tcp_minisocks.c
+2
-14
2 additions, 14 deletions
net/ipv4/tcp_minisocks.c
with
2 additions
and
15 deletions
include/linux/tcp.h
+
0
−
1
View file @
b6242b9b
...
...
@@ -506,7 +506,6 @@ struct tcp_timewait_sock {
u32
tw_rcv_wnd
;
u32
tw_ts_recent
;
long
tw_ts_recent_stamp
;
struct
inet_peer
*
tw_peer
;
#ifdef CONFIG_TCP_MD5SIG
struct
tcp_md5sig_key
*
tw_md5_key
;
#endif
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/tcp_minisocks.c
+
2
−
14
View file @
b6242b9b
...
...
@@ -267,12 +267,9 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
const
struct
inet_connection_sock
*
icsk
=
inet_csk
(
sk
);
const
struct
tcp_sock
*
tp
=
tcp_sk
(
sk
);
bool
recycle_ok
=
false
;
bool
recycle_on
=
false
;
if
(
tcp_death_row
.
sysctl_tw_recycle
&&
tp
->
rx_opt
.
ts_recent_stamp
)
{
if
(
tcp_death_row
.
sysctl_tw_recycle
&&
tp
->
rx_opt
.
ts_recent_stamp
)
recycle_ok
=
tcp_remember_stamp
(
sk
);
recycle_on
=
true
;
}
if
(
tcp_death_row
.
tw_count
<
tcp_death_row
.
sysctl_max_tw_buckets
)
tw
=
inet_twsk_alloc
(
sk
,
state
);
...
...
@@ -281,7 +278,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
struct
tcp_timewait_sock
*
tcptw
=
tcp_twsk
((
struct
sock
*
)
tw
);
const
int
rto
=
(
icsk
->
icsk_rto
<<
2
)
-
(
icsk
->
icsk_rto
>>
1
);
struct
inet_sock
*
inet
=
inet_sk
(
sk
);
struct
inet_peer
*
peer
=
NULL
;
tw
->
tw_transparent
=
inet
->
transparent
;
tw
->
tw_rcv_wscale
=
tp
->
rx_opt
.
rcv_wscale
;
...
...
@@ -305,12 +301,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
}
#endif
if
(
recycle_on
)
peer
=
icsk
->
icsk_af_ops
->
get_peer
(
sk
);
tcptw
->
tw_peer
=
peer
;
if
(
peer
)
atomic_inc
(
&
peer
->
refcnt
);
#ifdef CONFIG_TCP_MD5SIG
/*
* The timewait bucket does not have the key DB from the
...
...
@@ -362,11 +352,9 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
void
tcp_twsk_destructor
(
struct
sock
*
sk
)
{
#ifdef CONFIG_TCP_MD5SIG
struct
tcp_timewait_sock
*
twsk
=
tcp_twsk
(
sk
);
if
(
twsk
->
tw_peer
)
inet_putpeer
(
twsk
->
tw_peer
);
#ifdef CONFIG_TCP_MD5SIG
if
(
twsk
->
tw_md5_key
)
{
tcp_free_md5sig_pool
();
kfree_rcu
(
twsk
->
tw_md5_key
,
rcu
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment