---

yaml --- r: 157246 b: refs/heads/master c: d66ee05 h: refs/heads/master v: v3
git-mirror · Sep 2, 2009 · ca304f7 · ca304f7
1 parent d913f3a
commit ca304f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38bddf04bcfe661fbdab94888c3b72c32f6873b3
+refs/heads/master: d66ee0587c3927aea5178a822976c7c853d815fe
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
@@ -1025,6 +1025,7 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
 		sk->sk_prot = sk->sk_prot_creator = prot;
 		sock_lock_init(sk);
 		sock_net_set(sk, get_net(net));
+		atomic_set(&sk->sk_wmem_alloc, 1);
 	}
 
 	return sk;
@@ -1872,7 +1873,6 @@ void sock_init_data(struct socket *sock, struct sock *sk)
 	 */
 	smp_wmb();
 	atomic_set(&sk->sk_refcnt, 1);
-	atomic_set(&sk->sk_wmem_alloc, 1);
 	atomic_set(&sk->sk_drops, 0);
 }
 EXPORT_SYMBOL(sock_init_data);