[OpenWrt-Devel] [PATCH v2] mac80211: Adapt to changes to skb_get_hash_perturb()

[Hauke Mehrtens]

On 11/18/19 7:05 AM, Stefan Lippers-Hollmann wrote:
> From: Hauke Mehrtens <hauke at hauke-m.de>
> 
> The skb_get_hash_perturb() function now takes a siphash_key_t instead of
> an u32. This was changed in commit 55667441c84f ("net/flow_dissector:
> switch to siphash"). Use the correct type in the fq header file
> depending on the kernel version.
> 
> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
> Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
> ---
>  ...t-to-changes-to-skb_get_hash_perturb.patch | 68 +++++++++++++++++++
>  1 file changed, 68 insertions(+)
>  create mode 100644 package/kernel/mac80211/patches/build/102-backports-Adapt-to-changes-to-skb_get_hash_perturb.patch
> 
> The second hunk was missing from include/net/fq_impl.h, which resulted
> in a build error on 4.19.84:
> 
> Building backport-include/backport/autoconf.h ... done.
>   CC [M]  /tmp/pkg/openwrt/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-ipq806x_generic/backports-5.4-rc2-1/net/mac80211/tx.o
> In file included from /tmp/pkg/openwrt/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-ipq806x_generic/backports-5.4-rc2-1/net/mac80211/tx.c:28:
> /tmp/pkg/openwrt/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-ipq806x_generic/backports-5.4-rc2-1/include/net/fq_impl.h: In function 'fq_init':
> /tmp/pkg/openwrt/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-ipq806x_generic/backports-5.4-rc2-1/include/net/fq_impl.h:319:19: error: incompatible types when assigning to type 'siphash_key_t' {aka 'struct <anonymous>'} from type 'u32' {aka 'unsigned int'}
>   fq->perturbation = prandom_u32();
>                    ^
> make[9]: *** [scripts/Makefile.build:304: /tmp/pkg/openwrt/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/linux-ipq806x_generic/backports-5.4-rc2-1/net/mac80211/tx.o] Error 1
> 
> This v2 version has been tested in ipq806x/ kernel v4.19.84
> 
> build-tested (master):
>  - ath79/ kernel v4.19.84
>  - ath79/ kernel v4.14.154
>  - ipq806x/ kernel v4.19.84
>  - lantiq/ kernel v4.19.84
> 
> runtime tested:
>  - ath79/ kernel v4.19.84 (only short testing)
>  - ath79/ kernel v4.14.154 (only short testing)
>  - ipq806x/ kernel v4.19.84 (running fine for the last 4 hours)
> 
> I have not tested old/ unaffected kernels (v4.19.82, ...) so far.
> 


Thank you for the fixed version, I applied it to master and openwrt 19.07.

Hauke

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel