diff options
| author | Felix Fietkau <nbd@nbd.name> | 2024-04-26 12:24:21 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2024-04-26 12:24:46 +0200 |
| commit | 366544083e94ce86287b2194942f924fd1a29647 (patch) | |
| tree | db1f59e1b65c3fbf59eeaa19c3c1d6dbd238cf2b | |
| parent | 4e9f0e5be49757c95ca224e549655f5f67f3f9ec (diff) | |
| download | openwrt-366544083e94ce86287b2194942f924fd1a29647.tar.gz openwrt-366544083e94ce86287b2194942f924fd1a29647.tar.bz2 openwrt-366544083e94ce86287b2194942f924fd1a29647.zip | |
ath79: update 900-unaligned_access_hacks.patch after recent GRO change
Fixes build error
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch index e1c6835afd..da56bc306d 100644 --- a/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-6.1/900-unaligned_access_hacks.patch @@ -858,16 +858,25 @@ SVN-Revision: 35130 --- a/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); - th2 = tcp_hdr(p); +- 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); - if (*(u32 *)&th->source ^ *(u32 *)&th2->source) { + if (net_hdr_word(&th->source) ^ net_hdr_word(&th2->source)) { NAPI_GRO_CB(p)->same_flow = 0; 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)); flush |= (__force int)(th->ack_seq ^ th2->ack_seq); for (i = sizeof(*th); i < thlen; i += 4) |