@ -161,7 +161,7 @@ v13:
.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
.uart_pin = 7,
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
@@ -304 0,6 +3046 ,10 @@ int ath10k_core_start(struct ath10k *ar,
@@ -304 1,6 +3047 ,10 @@ int ath10k_core_start(struct ath10k *ar,
ar->eeprom_overrides.rc_txbf_probe);
}
@ -172,7 +172,7 @@ v13:
return 0;
err_hif_stop:
@@ -328 6,9 +3296 ,18 @@ static void ath10k_core_register_work(st
@@ -328 7,9 +3297 ,18 @@ static void ath10k_core_register_work(st
goto err_spectral_destroy;
}
@ -191,7 +191,7 @@ v13:
err_spectral_destroy:
ath10k_spectral_destroy(ar);
err_debug_destroy:
@@ -334 6,6 +3365 ,8 @@ void ath10k_core_unregister(struct ath10
@@ -334 7,6 +3366 ,8 @@ void ath10k_core_unregister(struct ath10
if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
return;
@ -210,7 +210,7 @@ v13:
#include "htt.h"
#include "htc.h"
@@ -12 45,6 +1246 ,13 @@ struct ath10k {
@@ -12 51,6 +1252 ,13 @@ struct ath10k {
} testmode;
struct {
@ -406,7 +406,7 @@ v13:
};
int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
@@ -9 75,6 +978 ,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
@@ -9 83,6 +986 ,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
}
@ -455,7 +455,7 @@ v13:
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
--- a/ath10k-4.16/wmi.c
+++ b/ath10k-4.16/wmi.c
@@ -73 25 ,6 +7325 ,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
@@ -73 6 2,6 +736 2,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
return skb;
}
@ -505,7 +505,7 @@ v13:
static struct sk_buff *
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
enum wmi_sta_ps_mode psmode)
@@ -89 40,6 +8983 ,9 @@ static const struct wmi_ops wmi_ops = {
@@ -89 77,6 +9020 ,9 @@ static const struct wmi_ops wmi_ops = {
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
@ -515,7 +515,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -90 10,6 +9056 ,8 @@ static const struct wmi_ops wmi_10_1_ops
@@ -90 47,6 +9093 ,8 @@ static const struct wmi_ops wmi_10_1_ops
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
@ -524,7 +524,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -9 087,6 +9135 ,8 @@ static const struct wmi_ops wmi_10_2_ops
@@ -9 124,6 +9172 ,8 @@ static const struct wmi_ops wmi_10_2_ops
.gen_delba_send = ath10k_wmi_op_gen_delba_send,
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
@ -533,7 +533,7 @@ v13:
/* .gen_pdev_enable_adaptive_cca not implemented */
};
@@ -91 57,6 +9207 ,8 @@ static const struct wmi_ops wmi_10_2_4_o
@@ -91 94,6 +9244 ,8 @@ static const struct wmi_ops wmi_10_2_4_o
.gen_pdev_enable_adaptive_cca =
ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
@ -542,7 +542,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -92 33,6 +9285 ,8 @@ static const struct wmi_ops wmi_10_4_ops
@@ -92 70,6 +9322 ,8 @@ static const struct wmi_ops wmi_10_4_ops
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
.gen_echo = ath10k_wmi_op_gen_echo,
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
@ -553,7 +553,7 @@ v13:
int ath10k_wmi_attach(struct ath10k *ar)
--- a/ath10k-4.16/wmi.h
+++ b/ath10k-4.16/wmi.h
@@ -300 0,6 +3000 ,41 @@ enum wmi_10_4_feature_mask {
@@ -300 4,6 +3004 ,41 @@ enum wmi_10_4_feature_mask {
};
@ -674,7 +674,7 @@ v13:
.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
.uart_pin = 7,
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
@@ -310 2,6 +3108 ,10 @@ int ath10k_core_start(struct ath10k *ar,
@@ -310 3,6 +3109 ,10 @@ int ath10k_core_start(struct ath10k *ar,
ar->eeprom_overrides.rc_txbf_probe);
}
@ -685,7 +685,7 @@ v13:
return 0;
err_hif_stop:
@@ -335 6,9 +3366 ,18 @@ static void ath10k_core_register_work(st
@@ -335 7,9 +3367 ,18 @@ static void ath10k_core_register_work(st
goto err_spectral_destroy;
}
@ -704,7 +704,7 @@ v13:
err_spectral_destroy:
ath10k_spectral_destroy(ar);
err_debug_destroy:
@@ -341 6,6 +3435 ,8 @@ void ath10k_core_unregister(struct ath10
@@ -341 7,6 +3436 ,8 @@ void ath10k_core_unregister(struct ath10
if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
return;
@ -723,7 +723,7 @@ v13:
#include "htt.h"
#include "htc.h"
@@ -11 06,7 +1107 ,6 @@ struct ath10k {
@@ -11 13,7 +1114 ,6 @@ struct ath10k {
u32 low_5ghz_chan;
u32 high_5ghz_chan;
bool ani_enabled;
@ -731,7 +731,7 @@ v13:
bool p2p;
bool ct_all_pkts_htt; /* CT firmware only: native-wifi for all pkts */
@@ -13 55,6 +1355 ,13 @@ struct ath10k {
@@ -13 62,6 +1362 ,13 @@ struct ath10k {
} testmode;
struct {
@ -928,7 +928,7 @@ v13:
};
int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
@@ -107 1,6 +1074 ,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
@@ -107 9,6 +1082 ,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
}
@ -977,7 +977,7 @@ v13:
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
--- a/ath10k-4.19/wmi.c
+++ b/ath10k-4.19/wmi.c
@@ -78 44,6 +7844 ,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
@@ -78 81,6 +7881 ,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
return skb;
}
@ -1027,7 +1027,7 @@ v13:
static struct sk_buff *
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
enum wmi_sta_ps_mode psmode)
@@ -9 568,6 +9611 ,9 @@ static const struct wmi_ops wmi_ops = {
@@ -9 605,6 +9648 ,9 @@ static const struct wmi_ops wmi_ops = {
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
@ -1037,7 +1037,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -96 38,6 +9684 ,8 @@ static const struct wmi_ops wmi_10_1_ops
@@ -96 75,6 +9721 ,8 @@ static const struct wmi_ops wmi_10_1_ops
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
@ -1046,7 +1046,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -97 15,6 +9763 ,8 @@ static const struct wmi_ops wmi_10_2_ops
@@ -97 52,6 +9800 ,8 @@ static const struct wmi_ops wmi_10_2_ops
.gen_delba_send = ath10k_wmi_op_gen_delba_send,
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
@ -1055,7 +1055,7 @@ v13:
/* .gen_pdev_enable_adaptive_cca not implemented */
};
@@ -9 785,6 +9835 ,8 @@ static const struct wmi_ops wmi_10_2_4_o
@@ -9 822,6 +9872 ,8 @@ static const struct wmi_ops wmi_10_2_4_o
.gen_pdev_enable_adaptive_cca =
ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
@ -1064,7 +1064,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -9 865,6 +9917 ,8 @@ static const struct wmi_ops wmi_10_4_ops
@@ -9 902,6 +9954 ,8 @@ static const struct wmi_ops wmi_10_4_ops
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
.gen_echo = ath10k_wmi_op_gen_echo,
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
@ -1075,7 +1075,7 @@ v13:
int ath10k_wmi_attach(struct ath10k *ar)
--- a/ath10k-4.19/wmi.h
+++ b/ath10k-4.19/wmi.h
@@ -30 38,6 +3038 ,41 @@ enum wmi_10_4_feature_mask {
@@ -30 40,6 +3040 ,41 @@ enum wmi_10_4_feature_mask {
};