From 8b68b19998aa5365669694dfb24b5259ed465b89 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 1 Dec 2008 23:37:17 -0800 Subject: [PATCH] --- yaml --- r: 122407 b: refs/heads/master c: 6976a1d6c222c50ac93d2273b9cf57e6fd047e59 h: refs/heads/master i: 122405: f63a88b029a44e28b22b0ec770d79565a6526c37 122403: 42a862624a9aef7c245bfa11b9375d60a2d85736 122399: 23c11ed0bd72531f095576c9c363a43ca2cb2567 v: v3 --- [refs] | 2 +- trunk/net/ipv4/inet_connection_sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa244071993f..d2f576583c45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 422d9cdcb85b3622d08a590fed66021af7aea333 +refs/heads/master: 6976a1d6c222c50ac93d2273b9cf57e6fd047e59 diff --git a/trunk/net/ipv4/inet_connection_sock.c b/trunk/net/ipv4/inet_connection_sock.c index 1ccdbba528be..fe32255a9808 100644 --- a/trunk/net/ipv4/inet_connection_sock.c +++ b/trunk/net/ipv4/inet_connection_sock.c @@ -632,6 +632,8 @@ void inet_csk_listen_stop(struct sock *sk) acc_req = req->dl_next; + percpu_counter_inc(sk->sk_prot->orphan_count); + local_bh_disable(); bh_lock_sock(child); WARN_ON(sock_owned_by_user(child)); @@ -641,8 +643,6 @@ void inet_csk_listen_stop(struct sock *sk) sock_orphan(child); - percpu_counter_inc(sk->sk_prot->orphan_count); - inet_csk_destroy_sock(child); bh_unlock_sock(child);