diff options
author | Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2005-08-09 22:45:38 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:37:29 -0400 |
commit | e6848976b721eeb5551cd94673faafeef78d9f35 (patch) | |
tree | 6c78b0eb52614ff6386b603ca64091b5aefaa418 /net/ipv6/tcp_ipv6.c | |
parent | d13964f4490157b8a290903362bfbc54f750a6bc (diff) |
[NET]: Cleanup INET_REFCNT_DEBUG code
Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index ef29cfd936d3..885e05bd99f6 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1407,12 +1407,11 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1407 | newnp->mcast_oif = tcp_v6_iif(skb); | 1407 | newnp->mcast_oif = tcp_v6_iif(skb); |
1408 | newnp->mcast_hops = skb->nh.ipv6h->hop_limit; | 1408 | newnp->mcast_hops = skb->nh.ipv6h->hop_limit; |
1409 | 1409 | ||
1410 | /* Charge newly allocated IPv6 socket. Though it is mapped, | 1410 | /* |
1411 | * it is IPv6 yet. | 1411 | * No need to charge this sock to the relevant IPv6 refcnt debug socks count |
1412 | * here, tcp_create_openreq_child now does this for us, see the comment in | ||
1413 | * that function for the gory details. -acme | ||
1412 | */ | 1414 | */ |
1413 | #ifdef INET_REFCNT_DEBUG | ||
1414 | atomic_inc(&inet6_sock_nr); | ||
1415 | #endif | ||
1416 | 1415 | ||
1417 | /* It is tricky place. Until this moment IPv4 tcp | 1416 | /* It is tricky place. Until this moment IPv4 tcp |
1418 | worked with IPv6 af_tcp.af_specific. | 1417 | worked with IPv6 af_tcp.af_specific. |
@@ -1467,10 +1466,11 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
1467 | if (newsk == NULL) | 1466 | if (newsk == NULL) |
1468 | goto out; | 1467 | goto out; |
1469 | 1468 | ||
1470 | /* Charge newly allocated IPv6 socket */ | 1469 | /* |
1471 | #ifdef INET_REFCNT_DEBUG | 1470 | * No need to charge this sock to the relevant IPv6 refcnt debug socks |
1472 | atomic_inc(&inet6_sock_nr); | 1471 | * count here, tcp_create_openreq_child now does this for us, see the |
1473 | #endif | 1472 | * comment in that function for the gory details. -acme |
1473 | */ | ||
1474 | 1474 | ||
1475 | ip6_dst_store(newsk, dst, NULL); | 1475 | ip6_dst_store(newsk, dst, NULL); |
1476 | newsk->sk_route_caps = dst->dev->features & | 1476 | newsk->sk_route_caps = dst->dev->features & |