summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-18 08:17:34 +0200
committerDavid S. Miller <davem@davemloft.net>2008-04-18 08:17:34 +0200
commite56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4 (patch)
treecc145929b5b5dd3e7d2ddeb75cba6c7813a5c206 /include
parentSCTP: Initialize partial_bytes_acked to 0, when all of the data is acked. (diff)
downloadlinux-e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4.tar.xz
linux-e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4.zip
[INET]: Drop the inet_inherit_port() call.
As I can see from the code, two places (tcp_v6_syn_recv_sock and dccp_v6_request_recv_sock) that call this one already run with BHs disabled, so it's safe to call __inet_inherit_port there. Besides (in case I missed smth with code review) the calltrace tcp_v6_syn_recv_sock `- tcp_v4_syn_recv_sock `- __inet_inherit_port and the similar for DCCP are valid, but assumes BHs to be disabled. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/inet_hashtables.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 5525227c5e92..5ec91d88b517 100644
--- a/include/net/inet_hashtables.h
+++ b/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);