Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b58a38eea0598bfa9cd874f980869c6868b01b2a..b6a48d4a3794ae62f4bad5ac91c06c88c54a6f07 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2372,6 +2372,7 @@ struct proto tcp_prot = {
        .destroy_cgroup         = tcp_destroy_cgroup,
        .proto_cgroup           = tcp_proto_cgroup,
 #endif
+       .diag_destroy           = tcp_abort,
 };
 EXPORT_SYMBOL(tcp_prot);