From: Lorenzo Colitti <lorenzo@google.com>
Date: Mon, 16 Jan 2017 08:35:52 +0000 (+0900)
Subject: android: base-cfg: enable CONFIG_INET_DIAG_DESTROY
X-Git-Tag: release-20171130_firefly~4^2~100^2~159
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aadba8263313c853416a3c33f23b1d8c077c3f39;p=firefly-linux-kernel-4.4.55.git

android: base-cfg: enable CONFIG_INET_DIAG_DESTROY

As of Android N, this is required to close sockets when a
network disconnects.

Change-Id: I9fe81c5fc5224c17bfd8d9e236ea9e436b5971cb
(cherry picked from commit 4a15cee4bdaf764756e98cd8f03784f330459ab1)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 59c4f3a0df19..30e01074f64a 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -29,6 +29,7 @@ CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_INET6_AH=y
+CONFIG_INET6_DIAG_DESTROY=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y
 CONFIG_INET=y