diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-20 13:12:59 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-20 13:12:59 -0700 |
| commit | 321249bb2f9c61fd19adead0de1e058b94108d18 (patch) | |
| tree | 58beee90c04911c4bcb08da2b2a76fe7c486f485 /net/ipv6/udp.c | |
| parent | a517d900c6b4996dd6a6ba2f600dabe1c4da717a (diff) | |
| parent | b7c491d2c40fde253ec06a63b3f93ea60c0467a9 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y-merge
Change-Id: I049d2e9d238a92d56100e8e317be6688497eb501
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 1a5b9322e713..2415e55aaf8f 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1552,6 +1552,7 @@ struct proto udpv6_prot = { .compat_getsockopt = compat_udpv6_getsockopt, #endif .clear_sk = udp_v6_clear_sk, + .diag_destroy = udp_abort, }; static struct inet_protosw udpv6_protosw = { |