| Message ID | 1502890265-9285-1-git-send-email-xiangxia.m.yue@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2017-08-16 at 06:31 -0700, Tonghao Zhang wrote: > Because we remove the tcp_tw_recycle support in the commit > 4396e46187c ('tcp: remove tcp_tw_recycle') and also delete > the code 'af_ops->route_req' for sysctl_tw_recycle in tcp_conn_request. > Now when we call the 'af_ops->route_req', the dist always is > NULL, and we remove the unnecessay check. Thanks for these patches. You forgot : 1) a cover letter ( [PATCH next-next 0/2] tcp: .... 2) clearly state which tree you are targeting ( read Documentation/networking/netdev-FAQ.txt ) 3) Also, I would also have removed tcp_peer_is_proven() since it is also called with dst=NULL
On Wed, Aug 16, 2017 at 10:44 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote: > On Wed, 2017-08-16 at 06:31 -0700, Tonghao Zhang wrote: >> Because we remove the tcp_tw_recycle support in the commit > > >> 4396e46187c ('tcp: remove tcp_tw_recycle') and also delete >> the code 'af_ops->route_req' for sysctl_tw_recycle in tcp_conn_request. >> Now when we call the 'af_ops->route_req', the dist always is >> NULL, and we remove the unnecessay check. > > Thanks for these patches. > > You forgot : > > 1) a cover letter ( [PATCH next-next 0/2] tcp: .... > > 2) clearly state which tree you are targeting > ( read Documentation/networking/netdev-FAQ.txt ) Thanks, I do this in v2 > 3) Also, I would also have removed tcp_peer_is_proven() > since it is also called with dst=NULL Thanks for your work. > >
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d73903fe8c83..7eee2c7ddb7a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6132,11 +6132,10 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, isn = af_ops->init_seq(skb); } - if (!dst) { - dst = af_ops->route_req(sk, &fl, req); - if (!dst) - goto drop_and_free; - } + + dst = af_ops->route_req(sk, &fl, req); + if (!dst) + goto drop_and_free; tcp_ecn_create_request(req, skb, sk, dst);
Because we remove the tcp_tw_recycle support in the commit 4396e46187c ('tcp: remove tcp_tw_recycle') and also delete the code 'af_ops->route_req' for sysctl_tw_recycle in tcp_conn_request. Now when we call the 'af_ops->route_req', the dist always is NULL, and we remove the unnecessay check. Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> --- net/ipv4/tcp_input.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)