diff options
| author | John Audia <therealgraysky@proton.me> | 2022-05-09 04:07:21 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-16 20:26:38 +0200 |
| commit | 8592df67f40b3afdee68e36dc3820187ec0f98fc (patch) | |
| tree | d4076ddf755bd9e92738a0a878522c12a09f8f84 /target/linux/ath79 | |
| parent | 9ee6ac00c43cc253ac554495edb6214563ab1f31 (diff) | |
| download | upstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.tar.gz upstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.tar.bz2 upstream-8592df67f40b3afdee68e36dc3820187ec0f98fc.zip | |
kernel: bump 5.10 to 5.10.114
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ath79')
| -rw-r--r-- | target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch | 8 |
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 4a85701b0c..f2f48d6543 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 -@@ -611,48 +611,53 @@ static void tcp_options_write(__be32 *pt +@@ -612,48 +612,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)) { -@@ -660,16 +665,17 @@ static void tcp_options_write(__be32 *pt +@@ -661,16 +666,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; -@@ -682,13 +688,14 @@ static void tcp_options_write(__be32 *pt +@@ -683,13 +689,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 -@@ -4083,14 +4083,16 @@ static bool tcp_parse_aligned_timestamp( +@@ -4084,14 +4084,16 @@ static bool tcp_parse_aligned_timestamp( { const __be32 *ptr = (const __be32 *)(th + 1); |