aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-06-15 16:00:09 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-17 12:09:03 +0200
commit1b6f2af1483eb10a575ebe2f555ea00b98009d20 (patch)
tree0107aad5bb3b2bfb585fb166af9279dfc50c287c /target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
parent1de5f740623cb37cf7f38838fee587cbbfd9565c (diff)
downloadupstream-1b6f2af1483eb10a575ebe2f555ea00b98009d20.tar.gz
upstream-1b6f2af1483eb10a575ebe2f555ea00b98009d20.tar.bz2
upstream-1b6f2af1483eb10a575ebe2f555ea00b98009d20.zip
kernel: bump 5.15 to 5.15.117
Manually rebased: generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch Removed upstreamed: generic/backport-5.15/830-v6.2-ata-ahci-fix-enum-constants-for-gcc-13.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 0e89ba8430a5d9a638f71d9534ea4152fc26e278)
Diffstat (limited to 'target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch')
-rw-r--r--target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch b/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
index 683aa8a8df..2fa91deece 100644
--- a/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
+++ b/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
@@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -2735,7 +2735,7 @@ int nf_conntrack_init_start(void)
+@@ -2738,7 +2738,7 @@ int nf_conntrack_init_start(void)
if (!nf_conntrack_htable_size) {
nf_conntrack_htable_size