aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-03 14:15:01 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-06 19:58:46 +0200
commit122b625e7411a3711b6ed84b89676e73bb1e7de8 (patch)
tree6a6f74ffa625ec6cae90043688e37522885317ef /target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
parent7df6795d4c25447683fd4b4a4813bebcddaea547 (diff)
downloadupstream-122b625e7411a3711b6ed84b89676e73bb1e7de8.tar.gz
upstream-122b625e7411a3711b6ed84b89676e73bb1e7de8.tar.bz2
upstream-122b625e7411a3711b6ed84b89676e73bb1e7de8.zip
kernel: bump 5.15 to 5.15.59
Patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch')
-rw-r--r--target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
index ef9dab5508..1eaeefef00 100644
--- a/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.15/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
-@@ -613,48 +613,53 @@ static void tcp_options_write(__be32 *pt
+@@ -610,48 +610,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)) {
-@@ -662,16 +667,17 @@ static void tcp_options_write(__be32 *pt
+@@ -659,16 +664,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;
-@@ -684,13 +690,14 @@ static void tcp_options_write(__be32 *pt
+@@ -681,13 +687,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
-@@ -4138,14 +4138,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4140,14 +4140,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);