Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
b6242b9b
Commit
b6242b9b
authored
Jul 10, 2012
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tcp: Remove tw->tw_peer
No longer used. Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
81166dd6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
15 deletions
+2
-15
include/linux/tcp.h
include/linux/tcp.h
+0
-1
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_minisocks.c
+2
-14
No files found.
include/linux/tcp.h
View file @
b6242b9b
...
@@ -506,7 +506,6 @@ struct tcp_timewait_sock {
...
@@ -506,7 +506,6 @@ struct tcp_timewait_sock {
u32
tw_rcv_wnd
;
u32
tw_rcv_wnd
;
u32
tw_ts_recent
;
u32
tw_ts_recent
;
long
tw_ts_recent_stamp
;
long
tw_ts_recent_stamp
;
struct
inet_peer
*
tw_peer
;
#ifdef CONFIG_TCP_MD5SIG
#ifdef CONFIG_TCP_MD5SIG
struct
tcp_md5sig_key
*
tw_md5_key
;
struct
tcp_md5sig_key
*
tw_md5_key
;
#endif
#endif
...
...
net/ipv4/tcp_minisocks.c
View file @
b6242b9b
...
@@ -267,12 +267,9 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
...
@@ -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
inet_connection_sock
*
icsk
=
inet_csk
(
sk
);
const
struct
tcp_sock
*
tp
=
tcp_sk
(
sk
);
const
struct
tcp_sock
*
tp
=
tcp_sk
(
sk
);
bool
recycle_ok
=
false
;
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_ok
=
tcp_remember_stamp
(
sk
);
recycle_on
=
true
;
}
if
(
tcp_death_row
.
tw_count
<
tcp_death_row
.
sysctl_max_tw_buckets
)
if
(
tcp_death_row
.
tw_count
<
tcp_death_row
.
sysctl_max_tw_buckets
)
tw
=
inet_twsk_alloc
(
sk
,
state
);
tw
=
inet_twsk_alloc
(
sk
,
state
);
...
@@ -281,7 +278,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
...
@@ -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
);
struct
tcp_timewait_sock
*
tcptw
=
tcp_twsk
((
struct
sock
*
)
tw
);
const
int
rto
=
(
icsk
->
icsk_rto
<<
2
)
-
(
icsk
->
icsk_rto
>>
1
);
const
int
rto
=
(
icsk
->
icsk_rto
<<
2
)
-
(
icsk
->
icsk_rto
>>
1
);
struct
inet_sock
*
inet
=
inet_sk
(
sk
);
struct
inet_sock
*
inet
=
inet_sk
(
sk
);
struct
inet_peer
*
peer
=
NULL
;
tw
->
tw_transparent
=
inet
->
transparent
;
tw
->
tw_transparent
=
inet
->
transparent
;
tw
->
tw_rcv_wscale
=
tp
->
rx_opt
.
rcv_wscale
;
tw
->
tw_rcv_wscale
=
tp
->
rx_opt
.
rcv_wscale
;
...
@@ -305,12 +301,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
...
@@ -305,12 +301,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
}
}
#endif
#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
#ifdef CONFIG_TCP_MD5SIG
/*
/*
* The timewait bucket does not have the key DB from the
* 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)
...
@@ -362,11 +352,9 @@ void tcp_time_wait(struct sock *sk, int state, int timeo)
void
tcp_twsk_destructor
(
struct
sock
*
sk
)
void
tcp_twsk_destructor
(
struct
sock
*
sk
)
{
{
#ifdef CONFIG_TCP_MD5SIG
struct
tcp_timewait_sock
*
twsk
=
tcp_twsk
(
sk
);
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
)
{
if
(
twsk
->
tw_md5_key
)
{
tcp_free_md5sig_pool
();
tcp_free_md5sig_pool
();
kfree_rcu
(
twsk
->
tw_md5_key
,
rcu
);
kfree_rcu
(
twsk
->
tw_md5_key
,
rcu
);
...
...
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