Commit af05dc93 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[ICSK]: Move v4_addr2sockaddr from TCP to icsk 



Renaming it to inet_csk_addr2sockaddr.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8292a17a

include/net/inet_connection_sock.h

+2 −0
Original line number Diff line number Diff line
@@ -303,4 +303,6 @@ static inline unsigned int inet_csk_listen_poll(const struct sock *sk) 
extern int  inet_csk_listen_start(struct sock *sk, const int nr_table_entries);

extern void inet_csk_listen_stop(struct sock *sk);



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



#endif /* _INET_CONNECTION_SOCK_H */

net/ipv4/inet_connection_sock.c

+12 −0
Original line number Diff line number Diff line
@@ -636,3 +636,15 @@ 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->daddr;

	sin->sin_port		= inet->dport;

}



EXPORT_SYMBOL_GPL(inet_csk_addr2sockaddr);

net/ipv4/tcp_ipv4.c

+1 −11
Original line number Diff line number Diff line
@@ -1314,16 +1314,6 @@ int tcp_v4_rcv(struct sk_buff *skb) 
	goto discard_it;

}



static void v4_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)

{

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

	struct inet_sock *inet = inet_sk(sk);



	sin->sin_family		= AF_INET;

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

	sin->sin_port		= inet->dport;

}



/* VJ's idea. Save last timestamp seen from this destination

 * and hold it at least for normal timewait interval to use for duplicate

 * segment detection in subsequent connections, before they enter synchronized
@@ -1392,7 +1382,7 @@ struct inet_connection_sock_af_ops ipv4_specific = { 
	.net_header_len	=	sizeof(struct iphdr),

	.setsockopt	=	ip_setsockopt,

	.getsockopt	=	ip_getsockopt,

	.addr2sockaddr	=	v4_addr2sockaddr,

	.addr2sockaddr	=	inet_csk_addr2sockaddr,

	.sockaddr_len	=	sizeof(struct sockaddr_in),

};