diff options
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi-ops.h | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi-tlv.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/wmi.c | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h index 04dc4b9db04e..c8b64e7a6089 100644 --- 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 { | |||
| 110 | bool deliver_cab); | 110 | bool deliver_cab); |
| 111 | struct sk_buff *(*gen_pdev_set_wmm)(struct ath10k *ar, | 111 | struct sk_buff *(*gen_pdev_set_wmm)(struct ath10k *ar, |
| 112 | const struct wmi_wmm_params_all_arg *arg); | 112 | const struct wmi_wmm_params_all_arg *arg); |
| 113 | struct sk_buff *(*gen_request_stats)(struct ath10k *ar, | 113 | struct sk_buff *(*gen_request_stats)(struct ath10k *ar, u32 stats_mask); |
| 114 | enum wmi_stats_id stats_id); | ||
| 115 | struct sk_buff *(*gen_force_fw_hang)(struct ath10k *ar, | 114 | struct sk_buff *(*gen_force_fw_hang)(struct ath10k *ar, |
| 116 | enum wmi_force_fw_hang_type type, | 115 | enum wmi_force_fw_hang_type type, |
| 117 | u32 delay_ms); | 116 | u32 delay_ms); |
| @@ -816,14 +815,14 @@ ath10k_wmi_pdev_set_wmm_params(struct ath10k *ar, | |||
| 816 | } | 815 | } |
| 817 | 816 | ||
| 818 | static inline int | 817 | static inline int |
| 819 | ath10k_wmi_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id) | 818 | ath10k_wmi_request_stats(struct ath10k *ar, u32 stats_mask) |
| 820 | { | 819 | { |
| 821 | struct sk_buff *skb; | 820 | struct sk_buff *skb; |
| 822 | 821 | ||
| 823 | if (!ar->wmi.ops->gen_request_stats) | 822 | if (!ar->wmi.ops->gen_request_stats) |
| 824 | return -EOPNOTSUPP; | 823 | return -EOPNOTSUPP; |
| 825 | 824 | ||
| 826 | skb = ar->wmi.ops->gen_request_stats(ar, stats_id); | 825 | skb = ar->wmi.ops->gen_request_stats(ar, stats_mask); |
| 827 | if (IS_ERR(skb)) | 826 | if (IS_ERR(skb)) |
| 828 | return PTR_ERR(skb); | 827 | return PTR_ERR(skb); |
| 829 | 828 | ||
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c index 71614ba1b145..f995d8e120fb 100644 --- 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, | |||
| 2080 | } | 2080 | } |
| 2081 | 2081 | ||
| 2082 | static struct sk_buff * | 2082 | static struct sk_buff * |
| 2083 | ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, | 2083 | ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, u32 stats_mask) |
| 2084 | enum wmi_stats_id stats_id) | ||
| 2085 | { | 2084 | { |
| 2086 | struct wmi_request_stats_cmd *cmd; | 2085 | struct wmi_request_stats_cmd *cmd; |
| 2087 | struct wmi_tlv *tlv; | 2086 | struct wmi_tlv *tlv; |
| @@ -2095,7 +2094,7 @@ ath10k_wmi_tlv_op_gen_request_stats(struct ath10k *ar, | |||
| 2095 | tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD); | 2094 | tlv->tag = __cpu_to_le16(WMI_TLV_TAG_STRUCT_REQUEST_STATS_CMD); |
| 2096 | tlv->len = __cpu_to_le16(sizeof(*cmd)); | 2095 | tlv->len = __cpu_to_le16(sizeof(*cmd)); |
| 2097 | cmd = (void *)tlv->value; | 2096 | cmd = (void *)tlv->value; |
| 2098 | cmd->stats_id = __cpu_to_le32(stats_id); | 2097 | cmd->stats_id = __cpu_to_le32(stats_mask); |
| 2099 | 2098 | ||
| 2100 | ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv request stats\n"); | 2099 | ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi tlv request stats\n"); |
| 2101 | return skb; | 2100 | return skb; |
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 7b99cf7e4ec2..c7ea77edce24 100644 --- 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, | |||
| 4974 | } | 4974 | } |
| 4975 | 4975 | ||
| 4976 | static struct sk_buff * | 4976 | static struct sk_buff * |
| 4977 | ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id) | 4977 | ath10k_wmi_op_gen_request_stats(struct ath10k *ar, u32 stats_mask) |
| 4978 | { | 4978 | { |
| 4979 | struct wmi_request_stats_cmd *cmd; | 4979 | struct wmi_request_stats_cmd *cmd; |
| 4980 | struct sk_buff *skb; | 4980 | struct sk_buff *skb; |
| @@ -4984,9 +4984,10 @@ ath10k_wmi_op_gen_request_stats(struct ath10k *ar, enum wmi_stats_id stats_id) | |||
| 4984 | return ERR_PTR(-ENOMEM); | 4984 | return ERR_PTR(-ENOMEM); |
| 4985 | 4985 | ||
| 4986 | cmd = (struct wmi_request_stats_cmd *)skb->data; | 4986 | cmd = (struct wmi_request_stats_cmd *)skb->data; |
| 4987 | cmd->stats_id = __cpu_to_le32(stats_id); | 4987 | cmd->stats_id = __cpu_to_le32(stats_mask); |
| 4988 | 4988 | ||
| 4989 | ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats %d\n", (int)stats_id); | 4989 | ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi request stats 0x%08x\n", |
| 4990 | stats_mask); | ||
| 4990 | return skb; | 4991 | return skb; |
| 4991 | } | 4992 | } |
| 4992 | 4993 | ||
