ath10k: extend struct htt_mgmt_tx_dec for qca99x0

HTT_H2T_MSG_TYPE_MGMT_TX msg in 10.4 firmware carries additional
4 byte in htt_mgmt_tx_desc where it tells to firmware that at what
rate mgmt frame has to go out in the air. It's an optional parameter,
setting this field to zero will force firmware to choose auto rate
and send the frame out.

Those 4 byte info is missed out in the current code and 10.4 firmware
ended up reading some junk in those 4 byte and sometime malfunctioning.

Fix it by adding 4 byte in struct htt_mgmt_tx_desc. Non 10.4 firmware
will not process those four byte. So, adding 4 byte at the end of
struct htt_mgmt_tx_desc will not create any impact on other chipset.

Signed-off-by: Raja Mani <rmani@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 551f64bf64578cb930fadda493c60bef0a05927b..7583a126e87956cd4eb07d2987405485563e2e1d 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -284,6 +284,9 @@ struct htt_aggr_conf {
 } __packed;
 
 #define HTT_MGMT_FRM_HDR_DOWNLOAD_LEN 32
+struct htt_mgmt_tx_desc_qca99x0 {
+       __le32 rate;
+} __packed;
 
 struct htt_mgmt_tx_desc {
        u8 pad[sizeof(u32) - sizeof(struct htt_cmd_hdr)];
@@ -292,6 +295,9 @@ struct htt_mgmt_tx_desc {
        __le32 len;
        __le32 vdev_id;
        u8 hdr[HTT_MGMT_FRM_HDR_DOWNLOAD_LEN];
+       union {
+               struct htt_mgmt_tx_desc_qca99x0 qca99x0;
+       } __packed;
 } __packed;
 
 enum htt_mgmt_tx_status {

diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 1b34c1350f637ec082b318db3d643f6329782b34..a97dd9d4295bae7c9928ec983ee79c2fb5552bab 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -450,6 +450,8 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
 
        skb_put(txdesc, len);
        cmd = (struct htt_cmd *)txdesc->data;
+       memset(cmd, 0, len);
+
        cmd->hdr.msg_type         = HTT_H2T_MSG_TYPE_MGMT_TX;
        cmd->mgmt_tx.msdu_paddr = __cpu_to_le32(ATH10K_SKB_CB(msdu)->paddr);
        cmd->mgmt_tx.len        = __cpu_to_le32(msdu->len);