diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:26:26 +0000 |
| commit | b388b35a17d53dac58f2391795b823b7c5a54bac (patch) | |
| tree | a8db4b571297771e191489abeede06514fe94fd3 /net/ipv6/tcp_ipv6.c | |
| parent | 6b4fe72f6c1ab93a893a8bc2e1155d34d7689440 (diff) | |
| parent | 17aa01a7059b202f893a9e7e859032640318b458 (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.02-android
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 9b4478d4c360..2b0695af4308 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1931,6 +1931,7 @@ struct proto tcpv6_prot = { .proto_cgroup = tcp_proto_cgroup, #endif .clear_sk = tcp_v6_clear_sk, + .diag_destroy = tcp_abort, }; static const struct inet6_protocol tcpv6_protocol = { |