aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-10-11 15:53:45 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-10-29 13:00:28 +0100
commit269896fed0dfc079cee9447cd18624f931b2a738 (patch)
treeb91e8eb7f9b621613bf979a9af37b15a10c89c5d /target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
parentaaa1286b89a058bab2d23f55182453bf1f5a5e69 (diff)
downloadupstream-269896fed0dfc079cee9447cd18624f931b2a738.tar.gz
upstream-269896fed0dfc079cee9447cd18624f931b2a738.tar.bz2
upstream-269896fed0dfc079cee9447cd18624f931b2a738.zip
kernel: bump 5.15 to 5.15.135
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.135 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 096bb8ed82cebeb8926a5b64466afec649385159)
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 53f5b1472d..47216bee71 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
@@ -349,7 +349,7 @@ SVN-Revision: 35130
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -610,48 +610,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)) {
@@ -426,7 +426,7 @@ SVN-Revision: 35130
}
if (unlikely(opts->num_sack_blocks)) {
-@@ -659,16 +664,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;
@@ -450,7 +450,7 @@ SVN-Revision: 35130
}
tp->rx_opt.dsack = 0;
-@@ -681,13 +687,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;
@@ -750,7 +750,7 @@ SVN-Revision: 35130
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4157,14 +4157,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4170,14 +4170,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);