From 769f1162adf49bb919fed74d1402125d4419a85b Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Wed, 1 Feb 2017 12:53:36 -0700
Subject: [PATCH V3] UBUNTU: [Config] CONFIG_NET_DROP_MONITOR=m
BugLink: http://bugs.launchpad.net/bugs/1660634
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
v2 - drop erroneous IRQ_BYPASS_MANAGER changes
v3 - include anotations update
debian.master/config/amd64/config.common.amd64 | 1 -
debian.master/config/annotations | 4 +++-
debian.master/config/arm64/config.common.arm64 | 1 -
debian.master/config/armhf/config.common.armhf | 1 -
debian.master/config/config.common.ubuntu | 1 +
debian.master/config/i386/config.common.i386 | 1 -
debian.master/config/powerpc/config.common.powerpc | 1 -
debian.master/config/ppc64el/config.common.ppc64el | 1 -
debian.master/config/s390x/config.common.s390x | 1 -
9 files changed, 4 insertions(+), 8 deletions(-)
@@ -362,7 +362,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
# CONFIG_NET_ACT_IFE is not set
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -8811,7 +8811,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', 'arm64': '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'}>
@@ -396,7 +396,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NET_ACT_IFE is not set
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -378,7 +378,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NET_ACT_IFE is not set
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -5197,6 +5197,7 @@ CONFIG_NET_CLS_U32=m
CONFIG_NET_CORE=y
CONFIG_NET_DCCPPROBE=m
CONFIG_NET_DEVLINK=m
+CONFIG_NET_DROP_MONITOR=m
CONFIG_NET_DSA=m
CONFIG_NET_DSA_BCM_SF2=m
CONFIG_NET_DSA_HWMON=y
@@ -357,7 +357,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
# CONFIG_NET_ACT_IFE is not set
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -334,7 +334,6 @@ CONFIG_MTD_OF_PARTS=m
CONFIG_NATIONAL_PHY=m
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -373,7 +373,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
# CONFIG_NET_ACT_IFE is not set
CONFIG_NET_CADENCE=y
# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_DROP_MONITOR is not set
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_PACKET_ENGINE=y
@@ -311,7 +311,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NET_ACT_IFE is not set
# CONFIG_NET_CADENCE is not set
CONFIG_NET_CLS_IND=y
-CONFIG_NET_DROP_MONITOR=m
CONFIG_NET_KEY_MIGRATE=y
CONFIG_NET_MPLS_GSO=y
# CONFIG_NET_PACKET_ENGINE is not set
--
2.7.4