diff options
author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-08-09 22:47:37 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:37:42 -0400 |
commit | 614c6cb4f225a7da9f13e5dd0fac3b531078eb9f (patch) | |
tree | 2fd96c3476681cf76647592d4f162004b8c7416e /net/ipv4/tcp_ipv4.c | |
parent | e6848976b721eeb5551cd94673faafeef78d9f35 (diff) |
[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/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 67c670886c1..c7c99d33636 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1834,15 +1834,6 @@ do_time_wait: | |||
1834 | goto discard_it; | 1834 | goto discard_it; |
1835 | } | 1835 | } |
1836 | 1836 | ||
1837 | /* With per-bucket locks this operation is not-atomic, so that | ||
1838 | * this version is not worse. | ||
1839 | */ | ||
1840 | static void __tcp_v4_rehash(struct sock *sk) | ||
1841 | { | ||
1842 | sk->sk_prot->unhash(sk); | ||
1843 | sk->sk_prot->hash(sk); | ||
1844 | } | ||
1845 | |||
1846 | static int tcp_v4_reselect_saddr(struct sock *sk) | 1837 | static int tcp_v4_reselect_saddr(struct sock *sk) |
1847 | { | 1838 | { |
1848 | struct inet_sock *inet = inet_sk(sk); | 1839 | struct inet_sock *inet = inet_sk(sk); |
@@ -1889,7 +1880,7 @@ static int tcp_v4_reselect_saddr(struct sock *sk) | |||
1889 | * Besides that, it does not check for connection | 1880 | * Besides that, it does not check for connection |
1890 | * uniqueness. Wait for troubles. | 1881 | * uniqueness. Wait for troubles. |
1891 | */ | 1882 | */ |
1892 | __tcp_v4_rehash(sk); | 1883 | __sk_prot_rehash(sk); |
1893 | return 0; | 1884 | return 0; |
1894 | } | 1885 | } |
1895 | 1886 | ||