RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath79: update 900-unaligned_access_hacks.patch after recent GRO change 

Fixes build error

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-04-26 12:24:21 +02:00
parent 4e9f0e5be4
commit 366544083e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch
View File

@ -858,16 +858,25 @@ SVN-Revision: 35130
--- a/net/ipv4/tcp_offload.c --- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c +++ b/net/ipv4/tcp_offload.c
@@ -220,7 +220,7 @@ struct sk_buff *tcp_gro_receive(struct l @@ -60,7 +60,7 @@ static struct sk_buff *__tcpv4_gso_segme
th2 = tcp_hdr(seg->next);
iph2 = ip_hdr(seg->next);
- if (!(*(u32 *)&th->source ^ *(u32 *)&th2->source) &&
+ if (!(net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) &&
iph->daddr == iph2->daddr && iph->saddr == iph2->saddr)
return segs;
@@ -252,7 +252,7 @@ struct sk_buff *tcp_gro_lookup(struct li
continue;
th2 = tcp_hdr(p); th2 = tcp_hdr(p);
- if (*(u32 *)&th->source ^ *(u32 *)&th2->source) { - if (*(u32 *)&th->source ^ *(u32 *)&th2->source) {
+ if (net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) { + if (net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) {
NAPI_GRO_CB(p)->same_flow = 0; NAPI_GRO_CB(p)->same_flow = 0;
continue; continue;
} }
@@ -238,8 +238,8 @@ found: @@ -318,8 +318,8 @@ struct sk_buff *tcp_gro_receive(struct l
~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH)); ~(TCP_FLAG_CWR | TCP_FLAG_FIN | TCP_FLAG_PSH));
flush |= (__force int)(th->ack_seq ^ th2->ack_seq); flush |= (__force int)(th->ack_seq ^ th2->ack_seq);
for (i = sizeof(*th); i < thlen; i += 4) for (i = sizeof(*th); i < thlen; i += 4)