Commit ea3bea3a authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp/dccp: constify rtx_synack() and friends 



This is done to make sure we do not change listener socket
while sending SYNACK packets while socket lock is not held.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 802885fc

include/net/request_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct request_sock_ops { 
	int		obj_size;

	struct kmem_cache	*slab;

	char		*slab_name;

	int		(*rtx_syn_ack)(struct sock *sk,

	int		(*rtx_syn_ack)(const struct sock *sk,

				       struct request_sock *req);

	void		(*send_ack)(struct sock *sk, struct sk_buff *skb,

				    struct request_sock *req);

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -1676,7 +1676,7 @@ int tcp4_proc_init(void); 
void tcp4_proc_exit(void);

#endif



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

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

int tcp_conn_request(struct request_sock_ops *rsk_ops,

		     const struct tcp_request_sock_ops *af_ops,

		     struct sock *sk, struct sk_buff *skb);

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, 
	return &rt->dst;

}



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

static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req)

{

	int err = -1;

	struct sk_buff *skb;

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
}





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

static int dccp_v6_send_response(const struct sock *sk, struct request_sock *req)

{

	struct inet_request_sock *ireq = inet_rsk(req);

	struct ipv6_pinfo *np = inet6_sk(sk);

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -3502,7 +3502,7 @@ void tcp_send_probe0(struct sock *sk) 
				  TCP_RTO_MAX);

}



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

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

{

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

	struct flowi fl;