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 eb39e02899e58e2eb249f177bec36d5f17710e33..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>
@@ -1819,7 +1818,7 @@ void tcp_v4_destroy_sock(struct sock *sk)
 
        sk_sockets_allocated_dec(sk);
 
-       if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
+       if (mem_cgroup_sockets_enabled && sk->sk_memcg)
                sock_release_memcg(sk);
 }
 EXPORT_SYMBOL(tcp_v4_destroy_sock);
@@ -2343,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,
 };