aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-4.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-03-06 13:44:11 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-06 20:37:47 +0100
commit9ced994057ae8243445d3f22aa981753de4f7d34 (patch)
tree47fe012570c075f9d1551bcfc6660bf8af2239f6 /target/linux/ar71xx/patches-4.14
parent5ecc7ead48783136569a541d59398e08767fd8bc (diff)
downloadupstream-9ced994057ae8243445d3f22aa981753de4f7d34.tar.gz
upstream-9ced994057ae8243445d3f22aa981753de4f7d34.tar.bz2
upstream-9ced994057ae8243445d3f22aa981753de4f7d34.zip
kernel: bump 4.14 to 4.14.269
All patches refreshed automagically without conflicts. Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14')
-rw-r--r--target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
index 833b516a46..3774e44fd1 100644
--- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
@@ -312,7 +312,7 @@
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
-@@ -1352,8 +1352,8 @@ struct sk_buff **inet_gro_receive(struct
+@@ -1355,8 +1355,8 @@ struct sk_buff **inet_gro_receive(struct
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;
@@ -576,7 +576,7 @@
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
-@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -223,7 +223,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);