ath10k: add inline wrapper for htt_h2t_aggr_cfg_msg

This is done in order to make the *htt_h2t_aggr_cfg_msg* op align better
with the rest of the htt ops (whom all have inline wrappers).

It also adds support for the case when the op is missing (function
pointer is NULL).

As a result of this, the name of the 32 bit implementation in htt_tx.c
was changed and the function was made static.

Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index d235ff3098e8efe6aa9823ebf7f44aced7848be6..7b75200ceae54a34fbf7bd56f12457c7cedee2ff 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -257,7 +257,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt)
                return status;
        }
 
-       status = htt->tx_ops->htt_h2t_aggr_cfg_msg(htt,
+       status = ath10k_htt_h2t_aggr_cfg_msg(htt,
                                             htt->max_num_ampdu,
                                             htt->max_num_amsdu);
        if (status) {

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 19cd0cb5875f5c33dc6c895eef2a518f173ef47d..30c080094af140ac6447aebf1a92bb969d9ef0d2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -2086,6 +2086,19 @@ static inline void ath10k_htt_free_txbuff(struct ath10k_htt *htt)
                htt->tx_ops->htt_free_txbuff(htt);
 }
 
+static inline int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
+                                             u8 max_subfrms_ampdu,
+                                             u8 max_subfrms_amsdu)
+
+{
+       if (!htt->tx_ops->htt_h2t_aggr_cfg_msg)
+               return -EOPNOTSUPP;
+
+       return htt->tx_ops->htt_h2t_aggr_cfg_msg(htt,
+                                                max_subfrms_ampdu,
+                                                max_subfrms_amsdu);
+}
+
 struct ath10k_htt_rx_ops {
        size_t (*htt_get_rx_ring_size)(struct ath10k_htt *htt);
        void (*htt_config_paddrs_ring)(struct ath10k_htt *htt, void *vaddr);
@@ -2246,9 +2259,6 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_htt_h2t_ver_req_msg(struct ath10k_htt *htt);
 int ath10k_htt_h2t_stats_req(struct ath10k_htt *htt, u32 mask, u32 reset_mask,
                             u64 cookie);
-int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
-                               u8 max_subfrms_ampdu,
-                               u8 max_subfrms_amsdu);
 void ath10k_htt_hif_tx_complete(struct ath10k *ar, struct sk_buff *skb);
 int ath10k_htt_tx_fetch_resp(struct ath10k *ar,
                             __le32 token,

diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 1f391c739e40d9466bdf7737297630b03aae9d2f..1195f9e24dc02a3cbd4360da60b5d3a11023b1e6 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -978,9 +978,9 @@ static int ath10k_htt_send_rx_ring_cfg_hl(struct ath10k_htt *htt)
        return 0;
 }
 
-int ath10k_htt_h2t_aggr_cfg_msg(struct ath10k_htt *htt,
-                               u8 max_subfrms_ampdu,
-                               u8 max_subfrms_amsdu)
+static int ath10k_htt_h2t_aggr_cfg_msg_32(struct ath10k_htt *htt,
+                                         u8 max_subfrms_ampdu,
+                                         u8 max_subfrms_amsdu)
 {
        struct ath10k *ar = htt->ar;
        struct htt_aggr_conf *aggr_conf;
@@ -1747,7 +1747,7 @@ static const struct ath10k_htt_tx_ops htt_tx_ops_32 = {
        .htt_tx = ath10k_htt_tx_32,
        .htt_alloc_txbuff = ath10k_htt_tx_alloc_cont_txbuf_32,
        .htt_free_txbuff = ath10k_htt_tx_free_cont_txbuf_32,
-       .htt_h2t_aggr_cfg_msg = ath10k_htt_h2t_aggr_cfg_msg,
+       .htt_h2t_aggr_cfg_msg = ath10k_htt_h2t_aggr_cfg_msg_32,
 };
 
 static const struct ath10k_htt_tx_ops htt_tx_ops_64 = {