ath10k: change request stats command prototype

The expected parameter is not a single value but a
mask of values.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
index 04dc4b9db04e70de19e6b2a0ce13db772225f0d3..c8b64e7a6089c2ba2f874cb5aad3007c5c04f296 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h
+++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h
@@ -110,8 +110,7 @@ struct wmi_ops {
                                          bool deliver_cab);
        struct sk_buff *(*gen_pdev_set_wmm)(struct ath10k *ar,
                                            const struct wmi_wmm_params_all_arg *arg);
-       struct sk_buff *(*gen_request_stats)(struct ath10k *ar,
-                                            enum wmi_stats_id stats_id);
+       struct sk_buff *(*gen_request_stats)(struct ath10k *ar, u32 stats_mask);
        struct sk_buff *(*gen_force_fw_hang)(struct ath10k *ar,
                                             enum wmi_force_fw_hang_type type,
                                             u32 delay_ms);
@@ -816,14 +815,14 @@ ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar,
 }
 
 static inline int
-ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+ath10k_wmi_request_stats(struct ath10k *ar, u32 stats_mask)
 {
        struct sk_buff *skb;
 
        if (!ar->wmi.ops->gen_request_stats)
                return -EOPNOTSUPP;
 
-       skb = ar->wmi.ops->gen_request_stats(ar, stats_id);
+       skb = ar->wmi.ops->gen_request_stats(ar, stats_mask);
        if (IS_ERR(skb))
                return PTR_ERR(skb);
 

diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 71614ba1b145e590bd26a4cb8112237584248a11..f995d8e120fb17b4363551ab26a548421e894fd3 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -2080,8 +2080,7 @@ ath10k_wmi_tlv_op_gen_pdev_set_wmm(struct ath10k *ar,
 }
 
 static struct sk_buff *
-ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar,
-                                   enum wmi_stats_id stats_id)
+ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, u32 stats_mask)
 {
        struct wmi_request_stats_cmd *cmd;
        struct wmi_tlv *tlv;
@@ -2095,7 +2094,7 @@ ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar,
        tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD);
        tlv->len = __cpu_to_le16(sizeof(*cmd));
        cmd = (void *)tlv->value;
-       cmd->stats_id = __cpu_to_le32(stats_id);
+       cmd->stats_id = __cpu_to_le32(stats_mask);
 
        ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv request stats\n");
        return skb;

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 7b99cf7e4ec2c68e57e304dc7e79331b3ea7c993..c7ea77edce245ccd389111ad3ac9fd3958d4bc89 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -4974,7 +4974,7 @@ ath10k_wmi_op_gen_pdev_set_wmm(struct ath10k *ar,
 }
 
 static struct sk_buff *
-ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
+ath10k_wmi_op_gen_request_stats(struct ath10k *ar, u32 stats_mask)
 {
        struct wmi_request_stats_cmd *cmd;
        struct sk_buff *skb;
@@ -4984,9 +4984,10 @@ ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id)
                return ERR_PTR(-ENOMEM);
 
        cmd = (struct wmi_request_stats_cmd *)skb->data;
-       cmd->stats_id = __cpu_to_le32(stats_id);
+       cmd->stats_id = __cpu_to_le32(stats_mask);
 
-       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats %d\n", (int)stats_id);
+       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats 0x%08x\n",
+                  stats_mask);
        return skb;
 }