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

tcp/dccp: constify syn_recv_sock() method sock argument 



We'll soon no longer hold listener socket lock, these
functions do not modify the socket in any way.

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

include/net/inet_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct inet_connection_sock_af_ops { 
	int	    (*rebuild_header)(struct sock *sk);

	void	    (*sk_rx_dst_set)(struct sock *sk, const struct sk_buff *skb);

	int	    (*conn_request)(struct sock *sk, struct sk_buff *skb);

	struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,

	struct sock *(*syn_recv_sock)(const struct sock *sk, struct sk_buff *skb,

				      struct request_sock *req,

				      struct dst_entry *dst);

	u16	    net_header_len;

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, 
				      struct request_sock *req,

				      struct sk_buff *skb);

void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst);

struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,

struct sock *tcp_v4_syn_recv_sock(const struct sock *sk, struct sk_buff *skb,

				  struct request_sock *req,

				  struct dst_entry *dst);

int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);

net/dccp/dccp.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ struct sock *dccp_create_openreq_child(const struct sock *sk, 


int dccp_v4_do_rcv(struct sock *sk, struct sk_buff *skb);



struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb,

struct sock *dccp_v4_request_recv_sock(const struct sock *sk, struct sk_buff *skb,

				       struct request_sock *req,

				       struct dst_entry *dst);

struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,

net/dccp/ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ static inline u64 dccp_v4_init_sequence(const struct sk_buff *skb) 
 *

 * This is the equivalent of TCP's tcp_v4_syn_recv_sock

 */

struct sock *dccp_v4_request_recv_sock(struct sock *sk, struct sk_buff *skb,

struct sock *dccp_v4_request_recv_sock(const struct sock *sk,

				       struct sk_buff *skb,

				       struct request_sock *req,

				       struct dst_entry *dst)

{

net/dccp/ipv6.c

+3 −2
Original line number Diff line number Diff line
@@ -408,13 +408,14 @@ drop: 
	return -1;

}



static struct sock *dccp_v6_request_recv_sock(struct sock *sk,

static struct sock *dccp_v6_request_recv_sock(const struct sock *sk,

					      struct sk_buff *skb,

					      struct request_sock *req,

					      struct dst_entry *dst)

{

	struct inet_request_sock *ireq = inet_rsk(req);

	struct ipv6_pinfo *newnp, *np = inet6_sk(sk);

	struct ipv6_pinfo *newnp;

	const struct ipv6_pinfo *np = inet6_sk(sk);

	struct inet_sock *newinet;

	struct dccp6_sock *newdp6;

	struct sock *newsk;