[PATCH 1/3][SOCK] Rename __tcp_v4_rehash to __sk_prot_rehash

[Arnaldo Carvalho de Melo]

Hi David,

        Please consider pulling from:

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/acme/net-2.6.14-2.git

        This tree contains the INET_REFCNT_DEBUG, that is the only
outstanding changeset in the net-2.6.14.git tree (without the -2), I did
this because you may well have some issues with this series, so I left
the one with just the INET_REFCNT_DEBUG changeset.

                        - Arnaldo

tree a94857e1ce1f4e081071cbc77d2999ec6281e4f7
parent d1833e7701d765b3809a549345fc2685ae952f3d
author Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> 1122547698 -0300
committer Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> 1122547698 -0300

[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 <[EMAIL PROTECTED]>
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

------------------------------------------------------------------------------

 include/net/sock.h  |    9 +++++++++
 net/ipv4/tcp_ipv4.c |   11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

------------------------------------------------------------------------------

diff --git a/include/net/sock.h b/include/net/sock.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -607,6 +607,15 @@ static __inline__ void sock_prot_dec_use
        prot->stats[smp_processor_id()].inuse--;
 }
 
+/* With per-bucket locks this operation is not-atomic, so that
+ * this version is not worse.
+ */
+static inline void __sk_prot_rehash(struct sock *sk)
+{
+       sk->sk_prot->unhash(sk);
+       sk->sk_prot->hash(sk);
+}
+
 /* About 10 seconds */
 #define SOCK_DESTROY_TIME (10*HZ)
 
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1831,15 +1831,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);
@@ -1886,7 +1877,7 @@ static int tcp_v4_reselect_saddr(struct 
         * Besides that, it does not check for connection
         * uniqueness. Wait for troubles.
         */
-       __tcp_v4_rehash(sk);
+       __sk_prot_rehash(sk);
        return 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html