From d37bc130126762100fab7f29202f5f98b832aea4 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Fri, 11 May 2018 09:36:21 +0200
Subject: [PATCH] Update config 4.14

---
 root/target/linux/brcm2708/bcm2710/config-4.14 | 15 +--------------
 root/target/linux/generic/config-4.14          | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/root/target/linux/brcm2708/bcm2710/config-4.14 b/root/target/linux/brcm2708/bcm2710/config-4.14
index c1809092..02e7cd44 100644
--- a/root/target/linux/brcm2708/bcm2710/config-4.14
+++ b/root/target/linux/brcm2708/bcm2710/config-4.14
@@ -157,17 +157,6 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
-# CONFIG_DEFAULT_BALIA is not set
-CONFIG_DEFAULT_CFQ=y
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-# CONFIG_DEFAULT_LIA is not set
-CONFIG_DEFAULT_MPTCP_PM="default"
-CONFIG_DEFAULT_MPTCP_SCHED="default"
-# CONFIG_DEFAULT_OLIA is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_DEFAULT_WVEGAS is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2708=y
 CONFIG_DMA_BCM2835=y
@@ -338,8 +327,6 @@ CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_MPTCP_PM_ADVANCED is not set
-# CONFIG_MPTCP_SCHED_ADVANCED is not set
 # CONFIG_MTD is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -486,4 +473,4 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS=n
 CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=n
 CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=n
 CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=n
-CONFIG_SND_SOC_ICS43432=n
\ No newline at end of file
+CONFIG_SND_SOC_ICS43432=n
diff --git a/root/target/linux/generic/config-4.14 b/root/target/linux/generic/config-4.14
index e6d22977..1d8b7fde 100644
--- a/root/target/linux/generic/config-4.14
+++ b/root/target/linux/generic/config-4.14
@@ -5632,5 +5632,15 @@ CONFIG_TCP_CONG_LIA=y
 CONFIG_TCP_CONG_OLIA=y
 CONFIG_TCP_CONG_WVEGAS=y
 CONFIG_TCP_CONG_BALIA=y
-CONFIG_DEFAULT_TCP_CONG="olia"
-CONFIG_MPTCP=y
\ No newline at end of file
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_MPTCP=y
+# CONFIG_DEFAULT_BALIA is not set
+# CONFIG_DEFAULT_LIA is not set
+# CONFIG_DEFAULT_OLIA is not set
+# CONFIG_DEFAULT_WVEGAS is not set
+# CONFIG_DEFAULT_BBR is not set
+CONFIG_DEFAULT_CUBIC=y
+CONFIG_DEFAULT_MPTCP_PM="default"
+CONFIG_DEFAULT_MPTCP_SCHED="default"
+CONFIG_MPTCP_PM_ADVANCED=y
+CONFIG_MPTCP_SCHED_ADVANCED=y