diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-11-24 09:21:12 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-11-24 09:27:50 +0100 |
| commit | 193adc94d135be9e24b72d7b4f4a629ebe24131c (patch) | |
| tree | c82aaf1c76f5f2a6fedda63812a44f0920ed1472 /target/linux | |
| parent | 733a48273383e2337fcd7c0eb5ee8958f42dc4c0 (diff) | |
| download | upstream-193adc94d135be9e24b72d7b4f4a629ebe24131c.tar.gz upstream-193adc94d135be9e24b72d7b4f4a629ebe24131c.tar.bz2 upstream-193adc94d135be9e24b72d7b4f4a629ebe24131c.zip | |
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@true.cz>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch | 2 | ||||
| -rw-r--r-- | 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); |