Commit 66034f78 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

tcp/dccp: Remove inet_connection_sock_af_ops.addr2sockaddr(). 



inet_connection_sock_af_ops.addr2sockaddr() hasn't been used at all
in the git era.

  $ git grep addr2sockaddr $(git rev-list HEAD | tail -n 1)

Let's remove it.

Note that there was a 4 bytes hole after sockaddr_len and now it's
6 bytes, so the binary layout is not changed.

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


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

include/net/inet6_connection_sock.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ struct sockaddr; 
struct dst_entry *inet6_csk_route_req(const struct sock *sk, struct flowi6 *fl6,

				      const struct request_sock *req, u8 proto);



void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



int inet6_csk_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl);



struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu);

include/net/inet_connection_sock.h

+0 −4
Original line number Diff line number Diff line
@@ -44,12 +44,10 @@ struct inet_connection_sock_af_ops { 
				      struct request_sock *req_unhash,

				      bool *own_req);

	u16	    net_header_len;

	u16	    sockaddr_len;

	int	    (*setsockopt)(struct sock *sk, int level, int optname,

				  sockptr_t optval, unsigned int optlen);

	int	    (*getsockopt)(struct sock *sk, int level, int optname,

				  char __user *optval, int __user *optlen);

	void	    (*addr2sockaddr)(struct sock *sk, struct sockaddr *);

	void	    (*mtu_reduced)(struct sock *sk);

};
@@ -315,8 +313,6 @@ static inline __poll_t inet_csk_listen_poll(const struct sock *sk) 
int inet_csk_listen_start(struct sock *sk);

void inet_csk_listen_stop(struct sock *sk);



void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



/* update the fast reuse flag when adding a socket */

void inet_csk_update_fastreuse(struct inet_bind_bucket *tb,

			       struct sock *sk);

net/dccp/ipv4.c

+0 −2
Original line number Diff line number Diff line
@@ -934,8 +934,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv4_af_ops = { 
	.net_header_len	   = sizeof(struct iphdr),

	.setsockopt	   = ip_setsockopt,

	.getsockopt	   = ip_getsockopt,

	.addr2sockaddr	   = inet_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in),

};



static int dccp_v4_init_sock(struct sock *sk)

net/dccp/ipv6.c

+0 −4
Original line number Diff line number Diff line
@@ -988,8 +988,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops = { 
	.net_header_len	   = sizeof(struct ipv6hdr),

	.setsockopt	   = ipv6_setsockopt,

	.getsockopt	   = ipv6_getsockopt,

	.addr2sockaddr	   = inet6_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in6),

};



/*
@@ -1004,8 +1002,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = { 
	.net_header_len	   = sizeof(struct iphdr),

	.setsockopt	   = ipv6_setsockopt,

	.getsockopt	   = ipv6_getsockopt,

	.addr2sockaddr	   = inet6_csk_addr2sockaddr,

	.sockaddr_len	   = sizeof(struct sockaddr_in6),

};



static void dccp_v6_sk_destruct(struct sock *sk)

net/ipv4/inet_connection_sock.c

+0 −11
Original line number Diff line number Diff line
@@ -1553,17 +1553,6 @@ void inet_csk_listen_stop(struct sock *sk) 
}

EXPORT_SYMBOL_GPL(inet_csk_listen_stop);



void inet_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)

{

	struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;

	const struct inet_sock *inet = inet_sk(sk);



	sin->sin_family		= AF_INET;

	sin->sin_addr.s_addr	= inet->inet_daddr;

	sin->sin_port		= inet->inet_dport;

}

EXPORT_SYMBOL_GPL(inet_csk_addr2sockaddr);



static struct dst_entry *inet_csk_rebuild_route(struct sock *sk, struct flowi *fl)

{

	const struct inet_sock *inet = inet_sk(sk);