From: Petr Štetiar Date: Tue, 24 Nov 2020 08:21:12 +0000 (+0100) Subject: ar71xx,ath79: refresh 910-unaligned_access_hacks.patch X-Git-Tag: v1.5.4-20201214~24 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17d834e2727b011cd4edd40a56ba6cd65a6da1d9;p=librecmc%2Flibrecmc.git ar71xx,ath79: refresh 910-unaligned_access_hacks.patch Commit c9c7b4b3945c ("kernel: add netfilter-actual-sk patch") has touched net/ipv6/netfilter/ip6table_mangle.c which in turn has affected 910-unaligned_access_hacks.patch so the patch needs to be refreshed. Fixes: c9c7b4b3945c ("kernel: add netfilter-actual-sk patch") Signed-off-by: Petr Štetiar --- diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index c5e201b371..22d07f8fbe 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -937,6 +937,6 @@ ipv6_hdr(skb)->hop_limit != hop_limit || - flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) { + flowlabel != net_hdr_word(ipv6_hdr(skb)))) { - err = ip6_route_me_harder(state->net, skb); + err = ip6_route_me_harder(state->net, state->sk, skb); if (err < 0) ret = NF_DROP_ERR(err); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index d9cefe1dfa..68f0100b31 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -895,6 +895,6 @@ ipv6_hdr(skb)->hop_limit != hop_limit || - flowlabel != *((u_int32_t *)ipv6_hdr(skb)))) { + flowlabel != net_hdr_word(ipv6_hdr(skb)))) { - err = ip6_route_me_harder(state->net, skb); + err = ip6_route_me_harder(state->net, state->sk, skb); if (err < 0) ret = NF_DROP_ERR(err);