---

yaml --- r: 90893 b: refs/heads/master c: e56d8b8 h: refs/heads/master i: 90891: 03f1ce2 v: v3
git-mirror · Apr 18, 2008 · 9a8e931 · 9a8e931
1 parent 6ec29b5
commit 9a8e931
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b73a07c8ffaa70683022566080f4df3328ea18d
+refs/heads/master: e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4
diff --git a/trunk/include/net/inet_hashtables.h b/trunk/include/net/inet_hashtables.h
@@ -235,13 +235,6 @@ static inline void __inet_inherit_port(struct sock *sk, struct sock *child)
 	spin_unlock(&head->lock);
 }
 
-static inline void inet_inherit_port(struct sock *sk, struct sock *child)
-{
-	local_bh_disable();
-	__inet_inherit_port(sk, child);
-	local_bh_enable();
-}
-
 extern void inet_put_port(struct sock *sk);
 
 extern void inet_listen_wlock(struct inet_hashinfo *hashinfo);

diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c
@@ -625,7 +625,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
 	newinet->daddr = newinet->saddr = newinet->rcv_saddr = LOOPBACK4_IPV6;
 
 	__inet6_hash(newsk);
-	inet_inherit_port(sk, newsk);
+	__inet_inherit_port(sk, newsk);
 
 	return newsk;
 

diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
@@ -1534,7 +1534,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
 #endif
 
 	__inet6_hash(newsk);
-	inet_inherit_port(sk, newsk);
+	__inet_inherit_port(sk, newsk);
 
 	return newsk;