diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-18 02:17:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:17:34 -0400 |
commit | e56d8b8a2ee5fb7f63ceba58e1c0fb3c844888a4 (patch) | |
tree | cc145929b5b5dd3e7d2ddeb75cba6c7813a5c206 /net/dccp/ipv6.c | |
parent | 8b73a07c8ffaa70683022566080f4df3328ea18d (diff) |
[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 'net/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index f8371c7e5e80..9b1129bb7ece 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -625,7 +625,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, | |||
625 | newinet->daddr = newinet->saddr = newinet->rcv_saddr = LOOPBACK4_IPV6; | 625 | newinet->daddr = newinet->saddr = newinet->rcv_saddr = LOOPBACK4_IPV6; |
626 | 626 | ||
627 | __inet6_hash(newsk); | 627 | __inet6_hash(newsk); |
628 | inet_inherit_port(sk, newsk); | 628 | __inet_inherit_port(sk, newsk); |
629 | 629 | ||
630 | return newsk; | 630 | return newsk; |
631 | 631 | ||