aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-05-09 18:18:20 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-18 00:10:34 +0200
commite0bdf839722659ded1ce2f827f04ec4d9be3c6fc (patch)
treeda9d261db6cbc5d4a5fac5d93da6978880807b2c /target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
parentb4ea8e1089b6db4367d9bd40654d7b16590ae19f (diff)
downloadupstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.gz
upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.tar.bz2
upstream-e0bdf839722659ded1ce2f827f04ec4d9be3c6fc.zip
kernel: bump 5.4 to 5.4.191
Merged upstream: apm821xx/patches-5.4/150-ata-sata_dwc_460ex-Fix-crash-due-to-OOB-write.patch Similar patch merged upstream: bcm27xx/patches-5.4/950-0210-usb-xhci-Disable-the-XHCI-5-second-timeout.patch Manually adapted: layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch Compile-tested: armvirt/64 Run-tested: armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch')
-rw-r--r--target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
index 3828ae0784..8680ececf2 100644
--- a/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
@@ -799,7 +799,7 @@
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
-@@ -489,7 +489,7 @@ static inline bool is_etherdev_addr(cons
+@@ -488,7 +488,7 @@ static inline bool is_etherdev_addr(cons
* @b: Pointer to Ethernet header
*
* Compare two Ethernet headers, returns 0 if equal.
@@ -808,7 +808,7 @@
* aligned OR the platform can handle unaligned access. This is the
* case for all packets coming into netif_receive_skb or similar
* entry points.
-@@ -512,11 +512,12 @@ static inline unsigned long compare_ethe
+@@ -511,11 +511,12 @@ static inline unsigned long compare_ethe
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else