aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-25 16:10:45 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 15:43:08 +0100
commit078bdc1856ef650c844bf180e0cb144c2db11f45 (patch)
tree6dc11b40ba026359e118a63229bdcd9f7f861b1e /target/linux/ath79
parentb7388191a5e9e3af35a0b888a48a491c6ea125a7 (diff)
downloadupstream-078bdc1856ef650c844bf180e0cb144c2db11f45.tar.gz
upstream-078bdc1856ef650c844bf180e0cb144c2db11f45.tar.bz2
upstream-078bdc1856ef650c844bf180e0cb144c2db11f45.zip
kernel: bump 5.10 to 5.10.156
Manually rebased: ath79/patches-5.10/910-unaligned_access_hacks.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit acb10faa35748ca3a7e0f559c431a1a752fdc529)
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch14
1 files changed, 7 insertions, 7 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 035a79fb2e..d725333f68 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
@@ -118,9 +118,9 @@
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
-@@ -103,7 +103,7 @@ struct iphdr {
- __be32 saddr;
- __be32 daddr;
+@@ -105,7 +105,7 @@ struct iphdr {
+ __be32 daddr;
+ );
/*The options start here. */
-};
+} __attribute__((packed, aligned(2)));
@@ -129,10 +129,10 @@
struct ip_auth_hdr {
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
-@@ -132,7 +132,7 @@ struct ipv6hdr {
-
- struct in6_addr saddr;
- struct in6_addr daddr;
+@@ -134,7 +134,7 @@ struct ipv6hdr {
+ struct in6_addr saddr;
+ struct in6_addr daddr;
+ );
-};
+} __attribute__((packed, aligned(2)));