mirror of
https://github.com/Heleguo/lede.git
synced 2025-12-16 19:01:32 +00:00
kernel: bump all to latest HEAD
This commit is contained in:
parent
f2f51b561c
commit
874fee50eb
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.10 = .239
|
||||
LINUX_KERNEL_HASH-5.10.239 = 2dfa422b6bbe65a6b352a38129d27de918c3f0f05c72ecdd39d46d657ca0f0db
|
||||
LINUX_VERSION-5.10 = .240
|
||||
LINUX_KERNEL_HASH-5.10.240 = 8d88c3977226d666554b75f480d1e6c5f4e4d2acdf2a3462840c6bac88634d13
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.15 = .186
|
||||
LINUX_KERNEL_HASH-5.15.186 = 9c4efdd7ee550d524c017b5dae27725374526311e983661850cd880af671cb2a
|
||||
LINUX_VERSION-5.15 = .189
|
||||
LINUX_KERNEL_HASH-5.15.189 = e3d0025b87278e14733cb326700f17c7cceb54d920622b0d5fcd58a88c6850c3
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.4 = .295
|
||||
LINUX_KERNEL_HASH-5.4.295 = c48158f7735668aac78b9d74bb3616f57a4ea0816ca09f7db83f7834d705b6a9
|
||||
LINUX_VERSION-5.4 = .296
|
||||
LINUX_KERNEL_HASH-5.4.296 = 3d63614e58bf1befaba3f5713145200d09f26e564832c8948094fdf5b11fa73a
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.1 = .144
|
||||
LINUX_KERNEL_HASH-6.1.144 = 0f49bda42fbd7506063d537fec7d4d147c373a0324655fdaf2a65a000c9f7acf
|
||||
LINUX_VERSION-6.1 = .147
|
||||
LINUX_KERNEL_HASH-6.1.147 = 218f25663a41e3d811e84fa1c4acec50684898b2f6d0c8c0deb531d937e466f7
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.12 = .38
|
||||
LINUX_KERNEL_HASH-6.12.38 = f035fa8d83d59f793c76b23567b130cc42118f10696815fed03c16bb15670fcc
|
||||
LINUX_VERSION-6.12 = .40
|
||||
LINUX_KERNEL_HASH-6.12.40 = 4811af1317f98d2cccea3c7695969a2c03a27cb02fd2d5327032dd5341842933
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.6 = .98
|
||||
LINUX_KERNEL_HASH-6.6.98 = 296a34c500abc22c434b967d471d75568891f06a98f11fc31c5e79b037f45de5
|
||||
LINUX_VERSION-6.6 = .100
|
||||
LINUX_KERNEL_HASH-6.6.100 = d6c0ec4d55b14814f55b62a0b23a2d95faf66877e48fbfb4b83523e4afdf97ba
|
||||
|
||||
@ -59,17 +59,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
goto err_kfree;
|
||||
}
|
||||
|
||||
@@ -169,8 +176,8 @@ static int u_boot_env_parse(struct u_boo
|
||||
break;
|
||||
}
|
||||
crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
||||
- crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||
- data_len = priv->mtd->size - data_offset;
|
||||
+ crc32_data_len = dev_size - crc32_data_offset;
|
||||
+ data_len = dev_size - data_offset;
|
||||
|
||||
calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
|
||||
if (calc != crc32) {
|
||||
@@ -179,7 +186,7 @@ static int u_boot_env_parse(struct u_boo
|
||||
goto err_kfree;
|
||||
}
|
||||
|
||||
@ -41,16 +41,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
if (!buf) {
|
||||
err = -ENOMEM;
|
||||
goto err_out;
|
||||
@@ -175,7 +176,8 @@ static int u_boot_env_parse(struct u_boo
|
||||
data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||||
break;
|
||||
}
|
||||
- crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
||||
+ crc32_addr = (__le32 *)(buf + crc32_offset);
|
||||
+ crc32 = le32_to_cpu(*crc32_addr);
|
||||
crc32_data_len = dev_size - crc32_data_offset;
|
||||
data_len = dev_size - data_offset;
|
||||
|
||||
@@ -188,8 +190,6 @@ static int u_boot_env_parse(struct u_boo
|
||||
|
||||
buf[dev_size - 1] = '\0';
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From: Felix Fietkau <nbd@nbd.name>
|
||||
Date: Sat, 5 Jul 2025 13:44:10 +0200
|
||||
Subject: [PATCH] net: fix TCP/UDP fraglist GRO
|
||||
|
||||
Since "net: gro: use cb instead of skb->network_header", the skb network
|
||||
header is no longer set in the GRO path.
|
||||
This breaks fraglist segmentation, which relies on ip_hdr()/tcp_hdr()
|
||||
to check for address/port changes.
|
||||
Fix this regression by selectively setting the network header for merged
|
||||
segment skbs.
|
||||
|
||||
Fixes: 186b1ea73ad8 ("net: gro: use cb instead of skb->network_header")
|
||||
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
---
|
||||
|
||||
--- a/net/ipv4/tcp_offload.c
|
||||
+++ b/net/ipv4/tcp_offload.c
|
||||
@@ -355,6 +355,7 @@ struct sk_buff *tcp_gro_receive(struct l
|
||||
flush |= skb->ip_summed != p->ip_summed;
|
||||
flush |= skb->csum_level != p->csum_level;
|
||||
flush |= NAPI_GRO_CB(p)->count >= 64;
|
||||
+ skb_set_network_header(skb, skb_gro_receive_network_offset(skb));
|
||||
|
||||
if (flush || skb_gro_receive_list(p, skb))
|
||||
mss = 1;
|
||||
--- a/net/ipv4/udp_offload.c
|
||||
+++ b/net/ipv4/udp_offload.c
|
||||
@@ -604,6 +604,7 @@ static struct sk_buff *udp_gro_receive_s
|
||||
NAPI_GRO_CB(skb)->flush = 1;
|
||||
return NULL;
|
||||
}
|
||||
+ skb_set_network_header(skb, skb_gro_receive_network_offset(skb));
|
||||
ret = skb_gro_receive_list(p, skb);
|
||||
} else {
|
||||
skb_gro_postpull_rcsum(skb, uh,
|
||||
Loading…
Reference in New Issue
Block a user