瀏覽代碼

[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>
Arnaldo Carvalho de Melo 20 年之前
父節點
當前提交
614c6cb4f2
共有 2 個文件被更改,包括 10 次插入10 次删除
  1. 9 0
      include/net/sock.h
  2. 1 10
      net/ipv4/tcp_ipv4.c

+ 9 - 0
include/net/sock.h

@@ -612,6 +612,15 @@ static __inline__ void sock_prot_dec_use(struct proto *prot)
 	prot->stats[smp_processor_id()].inuse--;
 	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 */
 /* About 10 seconds */
 #define SOCK_DESTROY_TIME (10*HZ)
 #define SOCK_DESTROY_TIME (10*HZ)
 
 

+ 1 - 10
net/ipv4/tcp_ipv4.c

@@ -1834,15 +1834,6 @@ do_time_wait:
 	goto discard_it;
 	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)
 static int tcp_v4_reselect_saddr(struct sock *sk)
 {
 {
 	struct inet_sock *inet = inet_sk(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
 	 * Besides that, it does not check for connection
 	 * uniqueness. Wait for troubles.
 	 * uniqueness. Wait for troubles.
 	 */
 	 */
-	__tcp_v4_rehash(sk);
+	__sk_prot_rehash(sk);
 	return 0;
 	return 0;
 }
 }