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

Commit 695da14e authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

tcp: add queue_add_hash to tcp_request_sock_ops 



Add queue_add_hash member to tcp_request_sock_ops so that we can later
unify tcp_v4_conn_request and tcp_v6_conn_request.

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

include/net/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,8 @@ struct tcp_request_sock_ops { 
	int (*send_synack)(struct sock *sk, struct dst_entry *dst,

			   struct flowi *fl, struct request_sock *req,

			   u16 queue_mapping, struct tcp_fastopen_cookie *foc);

	void (*queue_hash_add)(struct sock *sk, struct request_sock *req,

			       const unsigned long timeout);

};



#ifdef CONFIG_SYN_COOKIES

net/ipv4/tcp_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { 
	.route_req	=	tcp_v4_route_req,

	.init_seq	=	tcp_v4_init_sequence,

	.send_synack	=	tcp_v4_send_synack,

	.queue_hash_add =	inet_csk_reqsk_queue_hash_add,

};



int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
@@ -1403,7 +1404,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
			goto drop_and_free;



		tcp_rsk(req)->listener = NULL;

		inet_csk_reqsk_queue_hash_add(sk, req, TCP_TIMEOUT_INIT);

		af_ops->queue_hash_add(sk, req, TCP_TIMEOUT_INIT);

	}



	return 0;

net/ipv6/tcp_ipv6.c

+2 −1
Original line number Diff line number Diff line
@@ -767,6 +767,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { 
	.route_req	=	tcp_v6_route_req,

	.init_seq	=	tcp_v6_init_sequence,

	.send_synack	=	tcp_v6_send_synack,

	.queue_hash_add =	inet6_csk_reqsk_queue_hash_add,

};



static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
@@ -1126,7 +1127,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
			goto drop_and_free;



		tcp_rsk(req)->listener = NULL;

		inet6_csk_reqsk_queue_hash_add(sk, req, TCP_TIMEOUT_INIT);

		af_ops->queue_hash_add(sk, req, TCP_TIMEOUT_INIT);

	}

	return 0;