From ff44ceeebae431a5c4821b542414282c4cb24a35 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 15 Apr 2021 20:24:52 +0200
Subject: [PATCH] Disable shortcut fe by default

---
 build.sh                                            | 13 +++++++++++++
 .../990-mptcp-fullmesh-raise-addresses-limit.patch  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index d3dfd774..3a5ecf70 100755
--- a/build.sh
+++ b/build.sh
@@ -37,6 +37,7 @@ OMR_ALL_PACKAGES=${OMR_ALL_PACKAGES:-no}
 OMR_TARGET=${OMR_TARGET:-x86_64}
 OMR_TARGET_CONFIG="config-$OMR_TARGET"
 OMR_KERNEL=${OMR_KERNEL:-5.4}
+SHORTCUT_FE=${SHORTCUT_FE:-no}
 #OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^\([0-9.]*\).*/\1/')}
 #OMR_RELEASE=${OMR_RELEASE:-$(git tag --sort=committerdate | tail -1)}
 OMR_RELEASE=${OMR_RELEASE:-$(git describe --tags `git rev-list --tags --max-count=1` | tail -1 | cut -d '-' -f1)}
@@ -204,6 +205,18 @@ if [ "$OMR_PACKAGES" = "mini" ]; then
 	echo "CONFIG_PACKAGE_${OMR_DIST}-mini=y" >> "$OMR_TARGET/source/.config"
 fi
 
+if [ "$SHORTCUT_FE" = "yes" ]; then
+	echo "# CONFIG_PACKAGE_kmod-fast-classifier is not set" >> "$OMR_TARGET/source/.config"
+	echo "CONFIG_PACKAGE_kmod-fast-classifier-noload=y" >> "$OMR_TARGET/source/.config"
+	echo "CONFIG_PACKAGE_kmod-shortcut_fe_cm=y" >> "$OMR_TARGET/source/.config"
+	echo "CONFIG_PACKAGE_kmod-shortcut_fe=y" >> "$OMR_TARGET/source/.config"
+else
+	echo "# CONFIG_PACKAGE_kmod-fast-classifier is not set" >> "$OMR_TARGET/source/.config"
+	echo "# CONFIG_PACKAGE_kmod-fast-classifier-noload is not set" >> "$OMR_TARGET/source/.config"
+	echo "# CONFIG_PACKAGE_kmod-shortcut_fe_cm is not set" >> "$OMR_TARGET/source/.config"
+	echo "# CONFIG_PACKAGE_kmod-shortcut_fe is not set" >> "$OMR_TARGET/source/.config"
+fi
+
 if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then
 	# We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target
 	# No time to check this, now, cause i am focused on make this target work
diff --git a/root/target/linux/x86/patches-5.4/990-mptcp-fullmesh-raise-addresses-limit.patch b/root/target/linux/x86/patches-5.4/990-mptcp-fullmesh-raise-addresses-limit.patch
index b99cae1e..db098b4e 100644
--- a/root/target/linux/x86/patches-5.4/990-mptcp-fullmesh-raise-addresses-limit.patch
+++ b/root/target/linux/x86/patches-5.4/990-mptcp-fullmesh-raise-addresses-limit.patch
@@ -23,7 +23,7 @@ index 8da833dd1712..07e5314b628c 100644
  	__u32	mptcp_rem_token;
  
 -#define MPTCP_PM_SIZE 608
-+#define MPTCP_PM_SIZE 720
++#define MPTCP_PM_SIZE 780
  	u8 mptcp_pm[MPTCP_PM_SIZE] __aligned(8);
  	const struct mptcp_pm_ops *pm_ops;