summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@ghostprotocols.net>2005-08-09 19:47:37 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 15:37:42 -0700
commit614c6cb4f225a7da9f13e5dd0fac3b531078eb9f (patch)
tree2fd96c3476681cf76647592d4f162004b8c7416e /net
parente6848976b721eeb5551cd94673faafeef78d9f35 (diff)
downloadop-kernel-dev-614c6cb4f225a7da9f13e5dd0fac3b531078eb9f.zip
op-kernel-dev-614c6cb4f225a7da9f13e5dd0fac3b531078eb9f.tar.gz
[SOCK]: Rename __tcp_v4_rehash to __sk_prot_rehash
This operation was already generic and DCCP will use it. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_ipv4.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 67c6708..c7c99d3 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1834,15 +1834,6 @@ do_time_wait:
goto discard_it;
}
-/* With per-bucket locks this operation is not-atomic, so that
- * this version is not worse.
- */
-static void __tcp_v4_rehash(struct sock *sk)
-{
- sk->sk_prot->unhash(sk);
- sk->sk_prot->hash(sk);
-}
-
static int tcp_v4_reselect_saddr(struct sock *sk)
{
struct inet_sock *inet = inet_sk(sk);
@@ -1889,7 +1880,7 @@ static int tcp_v4_reselect_saddr(struct sock *sk)
* Besides that, it does not check for connection
* uniqueness. Wait for troubles.
*/
- __tcp_v4_rehash(sk);
+ __sk_prot_rehash(sk);
return 0;
}
OpenPOWER on IntegriCloud