diff --git a/[refs] b/[refs] index e5a5126b64f3..979ed74ced51 100644 --- 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 index bbb25be7ddfe..76334228ed1c 100644 --- 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);