projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath79: re-add accidentally dropped patch to kernel 5.4
[oweals/openwrt.git]
/
target
/
linux
/
ath79
/
patches-5.4
/
910-unaligned_access_hacks.patch
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 950430a2a580da85582877839d74f8009b93e491..3ac89f1e5c84a99ed5e12767fe5874af3dcd8497 100644
(file)
--- a/
target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
+++ b/
target/linux/ath79/patches-5.4/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
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -4
57,48 +457
,53 @@ static void tcp_options_write(__be32 *pt
+@@ -4
60,48 +460
,53 @@ static void tcp_options_write(__be32 *pt
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
@@
-382,7
+382,7
@@
}
if (unlikely(opts->num_sack_blocks)) {
}
if (unlikely(opts->num_sack_blocks)) {
-@@ -50
6,16 +511
,17 @@ static void tcp_options_write(__be32 *pt
+@@ -50
9,16 +514
,17 @@ static void tcp_options_write(__be32 *pt
tp->duplicate_sack : tp->selective_acks;
int this_sack;
tp->duplicate_sack : tp->selective_acks;
int this_sack;
@@
-406,7
+406,7
@@
}
tp->rx_opt.dsack = 0;
}
tp->rx_opt.dsack = 0;
-@@ -5
28,13 +534
,14 @@ static void tcp_options_write(__be32 *pt
+@@ -5
31,13 +537
,14 @@ static void tcp_options_write(__be32 *pt
if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
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
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -395
3,14 +3953
,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -395
8,14 +3958
,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
{
const __be32 *ptr = (const __be32 *)(th + 1);
@@
-754,7
+754,7
@@
ptr = ip6hoff + sizeof(struct ipv6hdr);
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
ptr = ip6hoff + sizeof(struct ipv6hdr);
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
-@@ -27
4,8 +274
,10 @@ static inline bool neigh_key_eq128(const
+@@ -27
3,8 +273
,10 @@ static inline bool neigh_key_eq128(const
const u32 *n32 = (const u32 *)n->primary_key;
const u32 *p32 = pkey;
const u32 *n32 = (const u32 *)n->primary_key;
const u32 *p32 = pkey;
@@
-780,7
+780,7
@@
* No flags defined yet.
--- a/net/core/utils.c
+++ b/net/core/utils.c
* No flags defined yet.
--- a/net/core/utils.c
+++ b/net/core/utils.c
-@@ -4
43,8 +443
,14 @@ void inet_proto_csum_replace16(__sum16 *
+@@ -4
60,8 +460
,14 @@ void inet_proto_csum_replace16(__sum16 *
bool pseudohdr)
{
__be32 diff[] = {
bool pseudohdr)
{
__be32 diff[] = {
@@
-799,7
+799,7
@@
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
*sum = csum_fold(csum_partial(diff, sizeof(diff),
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
-@@ -4
96,7 +496
,7 @@ static inline bool is_etherdev_addr(cons
+@@ -4
89,7 +489
,7 @@ static inline bool is_etherdev_addr(cons
* @b: Pointer to Ethernet header
*
* Compare two Ethernet headers, returns 0 if equal.
* @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.
* aligned OR the platform can handle unaligned access. This is the
* case for all packets coming into netif_receive_skb or similar
* entry points.
-@@ -51
9,11 +519
,12 @@ static inline unsigned long compare_ethe
+@@ -51
2,11 +512
,12 @@ static inline unsigned long compare_ethe
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else
fold |= *(unsigned long *)(a + 6) ^ *(unsigned long *)(b + 6);
return fold;
#else