Help with cherry-pick from master to v19.07.1

Hi all,

I am using ar71xx with QCA9984 and kernel 4.14.150 and openWRT v19.07.1.

I am trying to cherry-pick https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=67174adc94f239786316616f577da4e78328e3ea

From master to v19.07.1 but I am receiving errors, so I manually added them to the repo. But I am getting this error:

/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19/mac.c:9041:30: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .cancel_remain_on_channel = ath10k_cancel_remain_on_channel,
                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19/mac.c:9041:30: note: (near initialization for 'ath10k_ops.cancel_remain_on_channel')
cc1: some warnings being treated as errors
scripts/Makefile.build:326: recipe for target '/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19/mac.o' failed
make[5]: *** [/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19/mac.o] Error 1
Makefile:1542: recipe for target '_module_/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19' failed
make[4]: *** [_module_/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/ath10k-4.19] Error 2
make[4]: Leaving directory '/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/linux-4.14.167'
Makefile:120: recipe for target '/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/.built' failed
make[3]: *** [/root/openwrt-env/openwrt-ar71xx/build_dir/target-mips_24kc_musl/linux-ar71xx_generic/ath10k-ct-regular/ath10k-ct-2020-01-29-3e3d0adb/.built] Error 2
make[3]: Leaving directory '/root/openwrt-env/openwrt-ar71xx/package/kernel/ath10k-ct'
time: package/kernel/ath10k-ct/regular/compile#4.23#0.77#4.81
package/Makefile:111: recipe for target 'package/kernel/ath10k-ct/compile' failed
make[2]: *** [package/kernel/ath10k-ct/compile] Error 2
make[2]: Leaving directory '/root/openwrt-env/openwrt-ar71xx'
package/Makefile:107: recipe for target '/root/openwrt-env/openwrt-ar71xx/staging_dir/target-mips_24kc_musl/stamp/.package_compile' failed
make[1]: *** [/root/openwrt-env/openwrt-ar71xx/staging_dir/target-mips_24kc_musl/stamp/.package_compile] Error 2
make[1]: Leaving directory '/root/openwrt-env/openwrt-ar71xx'
/root/openwrt-env/openwrt-ar71xx/include/toplevel.mk:225: recipe for target 'world' failed
make: *** [world] Error 2

Thanks for the advice!