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

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

inet: remove sk_listener parameter from syn_ack_timeout() 



It is not needed, and req->sk_listener points to the listener anyway.
request_sock argument can be const.

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

include/linux/dccp.h

+1 −1
Original line number Diff line number Diff line
@@ -317,6 +317,6 @@ static inline const char *dccp_role(const struct sock *sk) 
	return NULL;

}



extern void dccp_syn_ack_timeout(struct sock *sk, struct request_sock *req);

extern void dccp_syn_ack_timeout(const struct request_sock *req);



#endif /* _LINUX_DCCP_H */

include/net/request_sock.h

+1 −2
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ struct request_sock_ops { 
	void		(*send_reset)(struct sock *sk,

				      struct sk_buff *skb);

	void		(*destructor)(struct request_sock *req);

	void		(*syn_ack_timeout)(struct sock *sk,

					   struct request_sock *req);

	void		(*syn_ack_timeout)(const struct request_sock *req);

};



int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req);

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ int compat_tcp_getsockopt(struct sock *sk, int level, int optname, 
int compat_tcp_setsockopt(struct sock *sk, int level, int optname,

			  char __user *optval, unsigned int optlen);

void tcp_set_keepalive(struct sock *sk, int val);

void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req);

void tcp_syn_ack_timeout(const struct request_sock *req);

int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,

		int flags, int *addr_len);

void tcp_parse_options(const struct sk_buff *skb,

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static void dccp_v4_reqsk_destructor(struct request_sock *req) 
	kfree(inet_rsk(req)->opt);

}



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

void dccp_syn_ack_timeout(const struct request_sock *req)

{

}

EXPORT_SYMBOL(dccp_syn_ack_timeout);

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void reqsk_timer_handler(unsigned long data) 
		max_retries = defer_accept;

	syn_ack_recalc(req, thresh, max_retries, defer_accept,

		       &expire, &resend);

	req->rsk_ops->syn_ack_timeout(sk_listener, req);

	req->rsk_ops->syn_ack_timeout(req);

	if (!expire &&

	    (!resend ||

	     !inet_rtx_syn_ack(sk_listener, req) ||