aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-03 14:32:51 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-14 21:06:52 +0200
commitbe29de706c3f467a21d972c2c71d0d7c16f2b0e2 (patch)
tree70934f2b22e3cf502515d1b81204d98d06108f0d /target/linux/ath79
parent6c901ec97d73a7835c2bb7525e51cc3d3614f344 (diff)
downloadupstream-be29de706c3f467a21d972c2c71d0d7c16f2b0e2.tar.gz
upstream-be29de706c3f467a21d972c2c71d0d7c16f2b0e2.tar.bz2
upstream-be29de706c3f467a21d972c2c71d0d7c16f2b0e2.zip
kernel: bump 5.10 to 5.10.135
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit ccff2fbaea50ae983a25483a40ae2dbaeeca5581)
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
index ad19f8eaf9..713f01f20f 100644
--- a/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
@@ -305,7 +305,7 @@
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -612,48 +612,53 @@ static void tcp_options_write(__be32 *pt
+@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
@@ -382,7 +382,7 @@
}
if (unlikely(opts->num_sack_blocks)) {
-@@ -661,16 +666,17 @@ static void tcp_options_write(__be32 *pt
+@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt
tp->duplicate_sack : tp->selective_acks;
int this_sack;
@@ -406,7 +406,7 @@
}
tp->rx_opt.dsack = 0;
-@@ -683,13 +689,14 @@ static void tcp_options_write(__be32 *pt
+@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt
if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
@@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4092,14 +4092,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4093,14 +4093,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);