kernel: bump 5.10 to 5.10.166

[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-5.10 / 610-v5.13-55-netfilter-conntrack-Introduce-tcp-offload-timeout-co.patch

diff --git a/target/linux/generic/backport-5.10/610-v5.13-55-netfilter-conntrack-Introduce-tcp-offload-timeout-co.patch b/target/linux/generic/backport-5.10/610-v5.13-55-netfilter-conntrack-Introduce-tcp-offload-timeout-co.patch
index abc58d2a7cd0fd3dbaf3d6d2e72f1e37f99e38d1..0d30b0c593d2e440955e2e99fa01123cbd64fb06 100644 (file)
--- a/target/linux/generic/backport-5.10/610-v5.13-55-netfilter-conntrack-Introduce-tcp-offload-timeout-co.patch
+++ b/target/linux/generic/backport-5.10/610-v5.13-55-netfilter-conntrack-Introduce-tcp-offload-timeout-co.patch
@@ -33,7 +33,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  enum udp_conntrack {
 --- a/net/netfilter/nf_conntrack_proto_tcp.c
 +++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -1447,6 +1447,11 @@ void nf_conntrack_tcp_init_net(struct ne
+@@ -1457,6 +1457,11 @@ void nf_conntrack_tcp_init_net(struct ne
        tn->tcp_loose = nf_ct_tcp_loose;
        tn->tcp_be_liberal = nf_ct_tcp_be_liberal;
        tn->tcp_max_retrans = nf_ct_tcp_max_retrans;
@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        NF_SYSCTL_CT_PROTO_TCP_LOOSE,
        NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
        NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
-@@ -758,6 +762,20 @@ static struct ctl_table nf_ct_sysctl_tab
+@@ -757,6 +761,20 @@ static struct ctl_table nf_ct_sysctl_tab
                .mode           = 0644,
                .proc_handler   = proc_dointvec_jiffies,
        },
@@ -79,7 +79,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
        [NF_SYSCTL_CT_PROTO_TCP_LOOSE] = {
                .procname       = "nf_conntrack_tcp_loose",
                .maxlen         = sizeof(int),
-@@ -967,6 +985,12 @@ static void nf_conntrack_standalone_init
+@@ -960,6 +978,12 @@ static void nf_conntrack_standalone_init
        XASSIGN(LIBERAL, &tn->tcp_be_liberal);
        XASSIGN(MAX_RETRANS, &tn->tcp_max_retrans);
  #undef XASSIGN