Commit a4674aa5 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

tcp: preserve const qualifier in tcp_rsk() and inet_rsk() 



We can change tcp_rsk() and inet_rsk() to propagate their argument
const qualifier thanks to container_of_const().

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20260120125353.1470456-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1b58c94e

include/linux/tcp.h

+1 −4
Original line number Diff line number Diff line
@@ -181,10 +181,7 @@ struct tcp_request_sock { 
#endif

};



static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)

{

	return (struct tcp_request_sock *)req;

}

#define tcp_rsk(ptr) container_of_const(ptr, struct tcp_request_sock, req.req)



static inline bool tcp_rsk_used_ao(const struct request_sock *req)

{

include/net/inet_sock.h

+1 −4
Original line number Diff line number Diff line
@@ -100,10 +100,7 @@ struct inet_request_sock { 
	};

};



static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)

{

	return (struct inet_request_sock *)sk;

}

#define inet_rsk(ptr) container_of_const(ptr, struct inet_request_sock, req)



static inline u32 inet_request_mark(const struct sock *sk, struct sk_buff *skb)

{

include/trace/events/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ TRACE_EVENT(tcp_retransmit_synack, 
	),



	TP_fast_assign(

		struct inet_request_sock *ireq = inet_rsk(req);

		const struct inet_request_sock *ireq = inet_rsk(req);

		__be32 *p32;



		__entry->skaddr = sk;

net/ipv4/inet_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ struct sock *inet_csk_clone_lock(const struct sock *sk, 
{

	struct sock *newsk = sk_clone_lock(sk, priority);

	struct inet_connection_sock *newicsk;

	struct inet_request_sock *ireq;

	const struct inet_request_sock *ireq;

	struct inet_sock *newinet;



	if (!newsk)

net/ipv6/inet6_connection_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct dst_entry *inet6_csk_route_req(const struct sock *sk, 
				      const struct request_sock *req,

				      u8 proto)

{

	struct inet_request_sock *ireq = inet_rsk(req);

	const struct inet_request_sock *ireq = inet_rsk(req);

	const struct ipv6_pinfo *np = inet6_sk(sk);

	struct in6_addr *final_p, final;

	struct dst_entry *dst;