UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m

BugLink: http://bugs.launchpad.net/bugs/1660634
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Marcelo Cerri <marcelo.cerri@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 18e8e0fe2d89fe70cf42ba454c3e5a7a84e0ebf1..df1233fa8077bd6fe78390b0cc7d2d6e0a77d611 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8805,7 +8805,9 @@ CONFIG_NFT_REDIR_IPV6                           policy<{'amd64': 'm', 'arm64': '
 # Menu: Networking support >> Networking options >> Network testing
 CONFIG_NET_PKTGEN                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NET_TCPPROBE                             policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-CONFIG_NET_DROP_MONITOR                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_NET_DROP_MONITOR                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+#
+CONFIG_NET_DROP_MONITOR                                note<LP #1660634>
 
 # Menu: Networking support >> Networking options >> QoS and/or fair queueing
 CONFIG_NET_SCHED                                policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df20f790aa8a1dc4f7776141d77ced3154ed9c02..a7d8567e95a741cb98f4620a3330e16a98a43348 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5075,7 +5075,7 @@ CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m
-# CONFIG_NET_DROP_MONITOR is not set
+CONFIG_NET_DROP_MONITOR=m
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
 CONFIG_NET_EMATCH=y