[openwrt/openwrt] ar71xx, ath79: refresh 910-unaligned_access_hacks.patch

LEDE Commits lede-commits at lists.infradead.org
Tue Nov 24 03:32:32 EST 2020


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/193adc94d135be9e24b72d7b4f4a629ebe24131c

commit 193adc94d135be9e24b72d7b4f4a629ebe24131c
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Tue Nov 24 09:21:12 2020 +0100

    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 <ynezz at true.cz>
---
 target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch | 2 +-
 target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 1e9ec3d628..e7b7923773 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);



More information about the lede-commits mailing list