From: Maya Erez <merez@codeaurora.org>
Date: Wed, 11 May 2016 08:42:54 +0000 (+0300)
Subject: defconfig: msmcortex: enable bonding and TC drivers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ef13a52535f7d768ace70d3d725ee19addf59931;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

defconfig: msmcortex: enable bonding and TC drivers

bonding and TC drivers (sch_multiq) are required
for fast session transfer feature.

CRs-Fixed: 1001827
Change-Id: I08ee482ddc6c189241a69452fb12335d1ffb626f
Signed-off-by: Maya Erez <merez@codeaurora.org>
---

diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 3b8b1a07812b..f75aff7b9cfb 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -195,6 +195,8 @@ CONFIG_BRIDGE=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_MULTIQ=y
+CONFIG_NET_SCH_INGRESS=y
 CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 CONFIG_CLS_U32_MARK=y
@@ -206,6 +208,9 @@ CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_EMATCH_META=y
 CONFIG_NET_EMATCH_TEXT=y
 CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_RMNET_DATA=y
 CONFIG_RMNET_DATA_FC=y
 CONFIG_RMNET_DATA_DEBUG_PKT=y
@@ -254,6 +259,7 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=y
 CONFIG_NETDEVICES=y
+CONFIG_BONDING=y
 CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
 CONFIG_SKY2=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index a2f93ab6452b..d7749253a990 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -194,6 +194,8 @@ CONFIG_BRIDGE=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_PRIO=y
+CONFIG_NET_SCH_MULTIQ=y
+CONFIG_NET_SCH_INGRESS=y
 CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 CONFIG_CLS_U32_MARK=y
@@ -205,6 +207,9 @@ CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_EMATCH_META=y
 CONFIG_NET_EMATCH_TEXT=y
 CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_RMNET_DATA=y
 CONFIG_RMNET_DATA_FC=y
 CONFIG_RMNET_DATA_DEBUG_PKT=y
@@ -255,6 +260,7 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_DM_UEVENT=y
 CONFIG_DM_VERITY=y
 CONFIG_NETDEVICES=y
+CONFIG_BONDING=y
 CONFIG_TUN=y
 CONFIG_VIRTIO_NET=y
 CONFIG_SKY2=y