mirror of
https://github.com/openwrt/openwrt.git
synced 2026-10-12 15:38:37 +04:00
kernel: bump 6.18 to 6.18.46
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.46 All patches automatically rebased via update_kernel.sh Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/24800 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
1 parent
5edc3c1b8a
commit
87e5289908
6 files changed
+12
-12
No files matched your search
@@ -51,7 +51,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR
|
||||
};
|
||||
|
||||
/*****************************************************************************\
|
||||
@@ -4626,6 +4636,15 @@ int sdhci_setup_host(struct sdhci_host *
|
||||
@@ -4642,6 +4652,15 @@ int sdhci_setup_host(struct sdhci_host *
|
||||
!(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
|
||||
mmc->caps |= MMC_CAP_UHS_DDR50;
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
||||
BUG_ON(data->blksz > host->mmc->max_blk_size);
|
||||
BUG_ON(data->blocks > 65535);
|
||||
|
||||
@@ -4770,11 +4770,16 @@ int sdhci_setup_host(struct sdhci_host *
|
||||
@@ -4786,11 +4786,16 @@ int sdhci_setup_host(struct sdhci_host *
|
||||
spin_lock_init(&host->lock);
|
||||
|
||||
/*
|
||||
|
||||
@@ -758,7 +758,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#include <net/netfilter/nf_flow_table.h>
|
||||
#include <net/netfilter/nf_conntrack.h>
|
||||
#include <net/netfilter/nf_conntrack_core.h>
|
||||
@@ -414,8 +413,7 @@ flow_offload_lookup(struct nf_flowtable
|
||||
@@ -415,8 +414,7 @@ flow_offload_lookup(struct nf_flowtable
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(flow_offload_lookup);
|
||||
|
||||
@@ -768,7 +768,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
void (*iter)(struct nf_flowtable *flowtable,
|
||||
struct flow_offload *flow, void *data),
|
||||
void *data)
|
||||
@@ -588,6 +586,7 @@ static void nf_flow_offload_gc_step(stru
|
||||
@@ -589,6 +587,7 @@ static void nf_flow_offload_gc_step(stru
|
||||
nf_flow_offload_stats(flow_table, flow);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.18 = .45
|
||||
LINUX_KERNEL_HASH-6.18.45 = 30fa4a56579ca614ac125a12614f7f6466f87ab1278aef7b951dd74156deab33
|
||||
LINUX_VERSION-6.18 = .46
|
||||
LINUX_KERNEL_HASH-6.18.46 = f5d44b93808b02cc2969c5404ba081d97523719c9fd2ba2de6db318b4141cca0
|
||||
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -3403,6 +3405,7 @@ static int packet_create(struct net *net
|
||||
@@ -3406,6 +3408,7 @@ static int packet_create(struct net *net
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->rollover = NULL;
|
||||
po->prot_hook.func = packet_rcv;
|
||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -4071,6 +4074,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -4074,6 +4077,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val);
|
||||
return 0;
|
||||
}
|
||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
default:
|
||||
return -ENOPROTOOPT;
|
||||
}
|
||||
@@ -4133,6 +4146,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -4136,6 +4149,13 @@ static int packet_getsockopt(struct sock
|
||||
case PACKET_COPY_THRESH:
|
||||
val = READ_ONCE(pkt_sk(sk)->copy_thresh);
|
||||
break;
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
|
||||
--- a/net/netfilter/nf_flow_table_core.c
|
||||
+++ b/net/netfilter/nf_flow_table_core.c
|
||||
@@ -811,6 +811,23 @@ static struct pernet_operations nf_flow_
|
||||
@@ -812,6 +812,23 @@ static struct pernet_operations nf_flow_
|
||||
.exit_batch = nf_flow_table_pernet_exit,
|
||||
};
|
||||
|
||||
@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
static int __init nf_flow_table_module_init(void)
|
||||
{
|
||||
int ret;
|
||||
@@ -827,6 +844,10 @@ static int __init nf_flow_table_module_i
|
||||
@@ -828,6 +845,10 @@ static int __init nf_flow_table_module_i
|
||||
if (ret)
|
||||
goto out_bpf;
|
||||
|
||||
@@ -45,7 +45,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
return 0;
|
||||
|
||||
out_bpf:
|
||||
@@ -838,6 +859,7 @@ out_offload:
|
||||
@@ -839,6 +860,7 @@ out_offload:
|
||||
|
||||
static void __exit nf_flow_table_module_exit(void)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user