diff options
author | Octavian Purdila <octavian.purdila@intel.com> | 2014-06-25 10:09:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-27 18:53:36 -0400 |
commit | 5db92c994982ed826cf38f38d58bd09bc326aef6 (patch) | |
tree | a47f81307b287fa65edfef7b1bd94c21d8cd7f1f /net/ipv6/tcp_ipv6.c | |
parent | d6274bd8d6ea84b7b54cc1c3fde6bcb6143b104f (diff) |
tcp: unify tcp_v4_rtx_synack and tcp_v6_rtx_synack
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 210b6105afed..41389bbb08c0 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -506,19 +506,6 @@ done: | |||
506 | return err; | 506 | return err; |
507 | } | 507 | } |
508 | 508 | ||
509 | static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req) | ||
510 | { | ||
511 | const struct tcp_request_sock_ops *af_ops = tcp_rsk(req)->af_specific; | ||
512 | struct flowi fl; | ||
513 | int res; | ||
514 | |||
515 | res = af_ops->send_synack(sk, NULL, &fl, req, 0, NULL); | ||
516 | if (!res) { | ||
517 | TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS); | ||
518 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS); | ||
519 | } | ||
520 | return res; | ||
521 | } | ||
522 | 509 | ||
523 | static void tcp_v6_reqsk_destructor(struct request_sock *req) | 510 | static void tcp_v6_reqsk_destructor(struct request_sock *req) |
524 | { | 511 | { |
@@ -759,7 +746,7 @@ static struct dst_entry *tcp_v6_route_req(struct sock *sk, struct flowi *fl, | |||
759 | struct request_sock_ops tcp6_request_sock_ops __read_mostly = { | 746 | struct request_sock_ops tcp6_request_sock_ops __read_mostly = { |
760 | .family = AF_INET6, | 747 | .family = AF_INET6, |
761 | .obj_size = sizeof(struct tcp6_request_sock), | 748 | .obj_size = sizeof(struct tcp6_request_sock), |
762 | .rtx_syn_ack = tcp_v6_rtx_synack, | 749 | .rtx_syn_ack = tcp_rtx_synack, |
763 | .send_ack = tcp_v6_reqsk_send_ack, | 750 | .send_ack = tcp_v6_reqsk_send_ack, |
764 | .destructor = tcp_v6_reqsk_destructor, | 751 | .destructor = tcp_v6_reqsk_destructor, |
765 | .send_reset = tcp_v6_send_reset, | 752 | .send_reset = tcp_v6_send_reset, |