aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:21:04 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-15 14:26:41 +0200
commit287303b0628b7b448cb7705b087ece7fbc5b97c3 (patch)
tree8e74973039d5d30f61f1b25f9b3202ec0900f361 /target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch
parent920f2d92375de88151d8f836bdc778be85c7b552 (diff)
downloadupstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.gz
upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.tar.bz2
upstream-287303b0628b7b448cb7705b087ece7fbc5b97c3.zip
kernel: bump 5.10 to 5.10.184
Manually rebased: generic/pending-5.10/851-0004-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch All other patches automatically rebased. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch')
-rw-r--r--target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch b/target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch
index 55bf0f612b..79f6ccefc5 100644
--- a/target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch
+++ b/target/linux/generic/backport-5.10/612-v5.15-netfilter-conntrack-sanitize-table-size-default-sett.patch
@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
- 0 - disabled (default)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -2575,26 +2575,24 @@ int nf_conntrack_init_start(void)
+@@ -2578,26 +2578,24 @@ int nf_conntrack_init_start(void)
spin_lock_init(&nf_conntrack_locks[i]);
if (!nf_conntrack_htable_size) {