From 8271ec7b8799dda738120ed86ab86ac2ffd99815 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 24 Apr 2022 14:02:50 +0200 Subject: [PATCH] Revert "main/linux-postmarketos-allwinner: enable TCPMSS match functionality (MR 3039)" (MR 3086) Reverting this to cleanly revert to 5.16.4_git20220131 in the next patch. This reverts commit 56183bcae38ad034963027a2dc4cfa89ddfa5c91. --- device/main/linux-postmarketos-allwinner/APKBUILD | 4 ++-- .../config-postmarketos-allwinner.aarch64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index ea4bd264c..49bf9bdd7 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.17.0_git20220313 -pkgrel=1 +pkgrel=0 _tag="orange-pi-5.17-20220313-2345" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -98,7 +98,7 @@ dev() { } sha512sums=" b24b34e9a8ef66d37891c1d21eb71f9de83e0fde167ac08d776ac3e7b6262e9911908b453b598eb2e01658ec141d4d08337e4cc20f77af298e639ef9119edb61 linux-postmarketos-allwinner-orange-pi-5.17-20220313-2345.tar.gz -049a18de2758e390368450073dee9bf7d3a7aa6099901d128818c49d2bb2bba13ebcfe0458597c68b0fc350e7d1f30b531a66de4590e8308482a1e458f56a61a config-postmarketos-allwinner.aarch64 +c2473cbe6e94004ad7e285e6b8f374f857a0bc0ea8bab4b82a868796c5ad7dc612f2b80b32025803d93a7bd4148429ebb35ce7a238daf990f496331cd5f899af config-postmarketos-allwinner.aarch64 18738214275280f45375de9ccff83df7c9f37eb66dfd0834780e6b155d95a7d39c55f00fd66be4dde4a8b85accd285b6ef10285b41f75618ad7f44ddcdd0b9a9 config-postmarketos-allwinner.armv7 244d2c1356f5de77a5d05ba16d10e0d19915f634b3b1b96259857b1a3d57a023027a94622ffb56d5c72aeaeb7a9a220d629d51cfbb24225a7eca0140eb1ba19b 0001-dts-add-dontbeevil-pinephone-devkit.patch 31e2f5e0f590f017a355469609b5fd97fbc18d54c42a98bd44944a91a8e42eade0963def4704bc04d6cc5316a8adfe97b7854a2053fc33847ee797830218e029 0002-dts-add-pinetab-dev-old-display-panel.patch diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 156a1a451..f7c48c724 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1097,7 +1097,7 @@ CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NETFILTER_XT_MATCH_STATISTIC=y CONFIG_NETFILTER_XT_MATCH_STRING=y -CONFIG_NETFILTER_XT_MATCH_TCPMSS=y +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set CONFIG_NETFILTER_XT_MATCH_TIME=y CONFIG_NETFILTER_XT_MATCH_U32=y # end of Core Netfilter Configuration