Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5db92c99 authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

tcp: unify tcp_v4_rtx_synack and tcp_v6_rtx_synack 



Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6274bd8

include/net/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -1573,6 +1573,8 @@ int tcp4_proc_init(void); 
void tcp4_proc_exit(void);

#endif



int tcp_rtx_synack(struct sock *sk, struct request_sock *req);



/* TCP af-specific functions */

struct tcp_sock_af_ops {

#ifdef CONFIG_TCP_MD5SIG

net/ipv4/tcp_ipv4.c

+1 −13
Original line number Diff line number Diff line
@@ -845,18 +845,6 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst, 
	return err;

}



static int tcp_v4_rtx_synack(struct sock *sk, struct request_sock *req)

{

	const struct  tcp_request_sock_ops *af_ops = tcp_rsk(req)->af_specific;

	int res = af_ops->send_synack(sk, NULL, NULL, req, 0, NULL);



	if (!res) {

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);

	}

	return res;

}



/*

 *	IPv4 request_sock destructor.

 */
@@ -1269,7 +1257,7 @@ static struct dst_entry *tcp_v4_route_req(struct sock *sk, struct flowi *fl, 
struct request_sock_ops tcp_request_sock_ops __read_mostly = {

	.family		=	PF_INET,

	.obj_size	=	sizeof(struct tcp_request_sock),

	.rtx_syn_ack	=	tcp_v4_rtx_synack,

	.rtx_syn_ack	=	tcp_rtx_synack,

	.send_ack	=	tcp_v4_reqsk_send_ack,

	.destructor	=	tcp_v4_reqsk_destructor,

	.send_reset	=	tcp_v4_send_reset,

net/ipv4/tcp_output.c

+15 −0
Original line number Diff line number Diff line
@@ -3299,3 +3299,18 @@ void tcp_send_probe0(struct sock *sk) 
					  TCP_RTO_MAX);

	}

}



int tcp_rtx_synack(struct sock *sk, struct request_sock *req)

{

	const struct tcp_request_sock_ops *af_ops = tcp_rsk(req)->af_specific;

	struct flowi fl;

	int res;



	res = af_ops->send_synack(sk, NULL, &fl, req, 0, NULL);

	if (!res) {

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);

	}

	return res;

}

EXPORT_SYMBOL(tcp_rtx_synack);

net/ipv6/tcp_ipv6.c

+1 −14
Original line number Diff line number Diff line
@@ -506,19 +506,6 @@ static int tcp_v6_send_synack(struct sock *sk, struct dst_entry *dst, 
	return err;

}



static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req)

{

	const struct tcp_request_sock_ops *af_ops = tcp_rsk(req)->af_specific;

	struct flowi fl;

	int res;



	res = af_ops->send_synack(sk, NULL, &fl, req, 0, NULL);

	if (!res) {

		TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);

		NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPSYNRETRANS);

	}

	return res;

}



static void tcp_v6_reqsk_destructor(struct request_sock *req)

{
@@ -759,7 +746,7 @@ static struct dst_entry *tcp_v6_route_req(struct sock *sk, struct flowi *fl, 
struct request_sock_ops tcp6_request_sock_ops __read_mostly = {

	.family		=	AF_INET6,

	.obj_size	=	sizeof(struct tcp6_request_sock),

	.rtx_syn_ack	=	tcp_v6_rtx_synack,

	.rtx_syn_ack	=	tcp_rtx_synack,

	.send_ack	=	tcp_v6_reqsk_send_ack,

	.destructor	=	tcp_v6_reqsk_destructor,

	.send_reset	=	tcp_v6_send_reset,