ASoC: wm_adsp: Use correct local length in error message

[deliverable/linux.git] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 65947c1f4733a109b2f57b9c1e929b595ac9c5c7..5ced3e4013e3c2119f43b1674e69ff18e281e664 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -73,7 +73,6 @@
 #include <net/timewait_sock.h>
 #include <net/xfrm.h>
 #include <net/secure_seq.h>
-#include <net/tcp_memcontrol.h>
 #include <net/busy_poll.h>
 
 #include <linux/inet.h>
@@ -1818,7 +1817,9 @@ void tcp_v4_destroy_sock(struct sock *sk)
        tcp_saved_syn_free(tp);
 
        sk_sockets_allocated_dec(sk);
-       sock_release_memcg(sk);
+
+       if (mem_cgroup_sockets_enabled && sk->sk_memcg)
+               sock_release_memcg(sk);
 }
 EXPORT_SYMBOL(tcp_v4_destroy_sock);
 
@@ -2341,11 +2342,6 @@ struct proto tcp_prot = {
 #ifdef CONFIG_COMPAT
        .compat_setsockopt      = compat_tcp_setsockopt,
        .compat_getsockopt      = compat_tcp_getsockopt,
-#endif
-#ifdef CONFIG_MEMCG_KMEM
-       .init_cgroup            = tcp_init_cgroup,
-       .destroy_cgroup         = tcp_destroy_cgroup,
-       .proto_cgroup           = tcp_proto_cgroup,
 #endif
        .diag_destroy           = tcp_abort,
 };