commit 971af18bbfabb7b7c9c548da34a51e30869c08fc
author Arnaldo Carvalho de Melo <acme@mandriva.com> Tue Dec 13 23:14:47 2005 -0800
committer David S. Miller <davem@sunset.davemloft.net> Tue Jan 03 13:10:33 2006 -0800
tree 02597aa6885b9937e1d6526f4789d6841953d551
parent 89cee8b1cbb9dac40c92ef1968aea2b45f82fd18

[IPV6]: Reuse inet_csk_get_port in tcp_v6_get_port

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 4d5021e..2aa19c8 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -97,7 +97,8 @@
 
 static int tcp_v4_get_port(struct sock *sk, unsigned short snum)
 {
-	return inet_csk_get_port(&tcp_hashinfo, sk, snum);
+	return inet_csk_get_port(&tcp_hashinfo, sk, snum,
+				 inet_csk_bind_conflict);
 }
 
 static void tcp_v4_hash(struct sock *sk)