Signed-off-by: Michal Kazior <michal.kaz...@tieto.com>
---
drivers/net/wireless/ath/ath10k/core.h | 2 +-
drivers/net/wireless/ath/ath10k/htt.c | 16 ++++++++--------
drivers/net/wireless/ath/ath10k/htt.h | 28 ++++++++++++++--------------
drivers/net/wireless/ath/ath10k/htt_rx.c | 30 +++++++++++++++---------------
drivers/net/wireless/ath/ath10k/htt_tx.c | 18 +++++++++---------
drivers/net/wireless/ath/ath10k/txrx.c | 8 ++++----
drivers/net/wireless/ath/ath10k/txrx.h | 8 ++++----
7 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.h
b/drivers/net/wireless/ath/ath10k/core.h
index 42d9e72..dbe3f840 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -297,7 +297,7 @@ struct ath10k {
struct ath10k_bmi bmi;
struct ath10k_htc *htc;
- struct htt_struct *htt;
+ struct ath10k_htt *htt;
struct ath10k_hw_params {
u32 id;
diff --git a/drivers/net/wireless/ath/ath10k/htt.c
b/drivers/net/wireless/ath/ath10k/htt.c
index e5480d1..b172321 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -23,17 +23,17 @@
static void ath10k_htt_stop_queue(void *context)
{
- struct htt_struct *htt = context;
+ struct ath10k_htt *htt = context;
ieee80211_stop_queues(htt->ar->hw);
}
static void ath10k_htt_wake_queue(void *context)
{
- struct htt_struct *htt = context;
+ struct ath10k_htt *htt = context;
ieee80211_wake_queues(htt->ar->hw);
}
-static int ath10k_htt_htc_attach(struct htt_struct *htt)
+static int ath10k_htt_htc_attach(struct ath10k_htt *htt)
{
struct ath10k_htc_svc_conn_req conn_req;
struct ath10k_htc_svc_conn_resp conn_resp;
@@ -67,9 +67,9 @@ static int ath10k_htt_htc_attach(struct htt_struct *htt)
return 0;
}
-struct htt_struct *ath10k_htt_attach(struct ath10k *ar, struct ath10k_htc *htc)
+struct ath10k_htt *ath10k_htt_attach(struct ath10k *ar, struct ath10k_htc *htc)
{
- struct htt_struct *htt;
+ struct ath10k_htt *htt;
htt = kzalloc(sizeof(*htt), GFP_KERNEL);
if (!htt)
@@ -117,7 +117,7 @@ fail1:
#define HTT_TARGET_VERSION_TIMEOUT_HZ (3*HZ)
-static int ath10k_htt_verify_version(struct htt_struct *htt)
+static int ath10k_htt_verify_version(struct ath10k_htt *htt)
{
ath10k_dbg(ATH10K_DBG_HTT,
"htt target version %d.%d; host version %d.%d\n",
@@ -137,7 +137,7 @@ static int ath10k_htt_verify_version(struct htt_struct *htt)
return 0;
}
-int ath10k_htt_attach_target(struct htt_struct *htt)
+int ath10k_htt_attach_target(struct ath10k_htt *htt)
{
int status;
@@ -162,7 +162,7 @@ int ath10k_htt_attach_target(struct htt_struct *htt)
}
-void ath10k_htt_detach(struct htt_struct *htt)
+void ath10k_htt_detach(struct ath10k_htt *htt)
{
ath10k_htt_rx_detach(htt);
ath10k_htt_tx_detach(htt);
diff --git a/drivers/net/wireless/ath/ath10k/htt.h
b/drivers/net/wireless/ath/ath10k/htt.h
index c94f137..6415af0 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -1109,7 +1109,7 @@ struct htt_rx_info {
bool fcs_err;
};
-struct htt_struct {
+struct ath10k_htt {
struct ath10k *ar;
struct ath10k_htc *htc;
@@ -1267,21 +1267,21 @@ struct htt_rx_desc {
/* FIXME: add htt_tx_desc_init() */
-struct htt_struct *ath10k_htt_attach(struct ath10k *ar, struct ath10k_htc
*htc);
-int ath10k_htt_attach_target(struct htt_struct *htt);
-void ath10k_htt_detach(struct htt_struct *htt);
+struct ath10k_htt *ath10k_htt_attach(struct ath10k *ar, struct ath10k_htc
*htc);
+int ath10k_htt_attach_target(struct ath10k_htt *htt);
+void ath10k_htt_detach(struct ath10k_htt *htt);
-void ath10k_htt_tx_attach(struct htt_struct *htt);
-void ath10k_htt_tx_detach(struct htt_struct *htt);
-int ath10k_htt_rx_attach(struct htt_struct *htt);
-void ath10k_htt_rx_detach(struct htt_struct *htt);
+void ath10k_htt_tx_attach(struct ath10k_htt *htt);
+void ath10k_htt_tx_detach(struct ath10k_htt *htt);
+int ath10k_htt_rx_attach(struct ath10k_htt *htt);
+void ath10k_htt_rx_detach(struct ath10k_htt *htt);
void ath10k_htt_htc_tx_complete(void *context, struct sk_buff *skb);
void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb);
-int ath10k_htt_h2t_ver_req_msg(struct htt_struct *htt);
-int ath10k_htt_send_rx_ring_cfg_ll(struct htt_struct *htt);
+int ath10k_htt_h2t_ver_req_msg(struct ath10k_htt *htt);
+int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt);
-int ath10k_htt_tx_alloc_msdu_id(struct htt_struct *htt);
-void ath10k_htt_tx_free_msdu_id(struct htt_struct *htt, u16 msdu_id);
-int ath10k_htt_mgmt_tx(struct htt_struct *htt, struct sk_buff *);
-int ath10k_htt_tx(struct htt_struct *htt, struct sk_buff *);
+int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt);
+void ath10k_htt_tx_free_msdu_id(struct ath10k_htt *htt, u16 msdu_id);
+int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *);
+int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *);
#endif
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c
b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 7c90a2c..3fa0c1a 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -39,7 +39,7 @@
/* when under memory pressure rx ring refill may fail and needs a retry */
#define HTT_RX_RING_REFILL_RETRY_MS 50
-static int ath10k_htt_rx_ring_size(struct htt_struct *htt)
+static int ath10k_htt_rx_ring_size(struct ath10k_htt *htt)
{
int size;
@@ -80,7 +80,7 @@ static int ath10k_htt_rx_ring_size(struct htt_struct *htt)
return size;
}
-static int ath10k_htt_rx_ring_fill_level(struct htt_struct *htt)
+static int ath10k_htt_rx_ring_fill_level(struct ath10k_htt *htt)
{
int size;
@@ -101,7 +101,7 @@ static int ath10k_htt_rx_ring_fill_level(struct htt_struct
*htt)
return size;
}
-static void ath10k_htt_rx_ring_fill_n(struct htt_struct *htt, int num)
+static void ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
{
struct htt_rx_desc *rx_desc;
struct sk_buff *skb;
@@ -156,7 +156,7 @@ fail:
return;
}
-static void ath10k_htt_rx_msdu_buff_replenish(struct htt_struct *htt)
+static void ath10k_htt_rx_msdu_buff_replenish(struct ath10k_htt *htt)
{
int num_to_fill;
@@ -168,17 +168,17 @@ static void ath10k_htt_rx_msdu_buff_replenish(struct
htt_struct *htt)
static void ath10k_htt_rx_ring_refill_retry(unsigned long arg)
{
- struct htt_struct *htt = (struct htt_struct *)arg;
+ struct ath10k_htt *htt = (struct ath10k_htt *)arg;
ath10k_htt_rx_msdu_buff_replenish(htt);
}
-static unsigned ath10k_htt_rx_ring_elems(struct htt_struct *htt)
+static unsigned ath10k_htt_rx_ring_elems(struct ath10k_htt *htt)
{
return (__le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr) -
htt->rx_ring.sw_rd_idx.msdu_payld) & htt->rx_ring.size_mask;
}
-void ath10k_htt_rx_detach(struct htt_struct *htt)
+void ath10k_htt_rx_detach(struct ath10k_htt *htt)
{
int sw_rd_idx = htt->rx_ring.sw_rd_idx.msdu_payld;
@@ -211,7 +211,7 @@ void ath10k_htt_rx_detach(struct htt_struct *htt)
kfree(htt->rx_ring.buf.netbufs_ring);
}
-static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct htt_struct *htt)
+static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt)
{
int idx;
struct sk_buff *msdu;
@@ -233,7 +233,7 @@ static inline struct sk_buff
*ath10k_htt_rx_netbuf_pop(struct htt_struct *htt)
return msdu;
}
-static int ath10k_htt_rx_amsdu_pop(struct htt_struct *htt,
+static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
u8 **fw_desc, int *fw_desc_len,
struct sk_buff **head_msdu,
struct sk_buff **tail_msdu)
@@ -399,7 +399,7 @@ static int ath10k_htt_rx_amsdu_pop(struct htt_struct *htt,
return msdu_chaining;
}
-int ath10k_htt_rx_attach(struct htt_struct *htt)
+int ath10k_htt_rx_attach(struct ath10k_htt *htt)
{
dma_addr_t paddr;
void *vaddr;
@@ -552,7 +552,7 @@ static void ath10k_htt_rx_free_msdu_chain(struct sk_buff
*skb)
}
}
-static int ath10k_htt_rx_amsdu(struct htt_struct *htt,
+static int ath10k_htt_rx_amsdu(struct ath10k_htt *htt,
struct htt_rx_info *info)
{
struct htt_rx_desc *rxd;
@@ -655,7 +655,7 @@ static int ath10k_htt_rx_amsdu(struct htt_struct *htt,
return 0;
}
-static int ath10k_htt_rx_msdu(struct htt_struct *htt, struct htt_rx_info *info)
+static int ath10k_htt_rx_msdu(struct ath10k_htt *htt, struct htt_rx_info *info)
{
struct sk_buff *skb = info->skb;
struct htt_rx_desc *rxd;
@@ -741,7 +741,7 @@ static bool ath10k_htt_rx_has_fcs_err(struct sk_buff *skb)
return false;
}
-static void ath10k_htt_rx_handler(struct htt_struct *htt, struct
htt_rx_indication *rx)
+static void ath10k_htt_rx_handler(struct ath10k_htt *htt, struct
htt_rx_indication *rx)
{
struct htt_rx_info info;
struct htt_rx_indication_mpdu_range *mpdu_ranges;
@@ -853,7 +853,7 @@ static void ath10k_htt_rx_handler(struct htt_struct *htt,
struct htt_rx_indicati
ath10k_htt_rx_msdu_buff_replenish(htt);
}
-static void ath10k_htt_rx_frag_handler(struct htt_struct *htt,
+static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt,
struct htt_rx_fragment_indication *frag)
{
struct sk_buff *msdu_head, *msdu_tail;
@@ -955,7 +955,7 @@ end:
void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb)
{
- struct htt_struct *htt = (struct htt_struct *)context;
+ struct ath10k_htt *htt = (struct ath10k_htt *)context;
struct htt_resp *resp = (struct htt_resp *)skb->data;
/* confirm alignment */
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c
b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 5b3cad1..0ceaf02 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -21,7 +21,7 @@
#include "txrx.h"
#include "debug.h"
-int ath10k_htt_tx_alloc_msdu_id(struct htt_struct *htt)
+int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt)
{
int msdu_id;
@@ -36,7 +36,7 @@ int ath10k_htt_tx_alloc_msdu_id(struct htt_struct *htt)
return msdu_id;
}
-void ath10k_htt_tx_free_msdu_id(struct htt_struct *htt, u16 msdu_id)
+void ath10k_htt_tx_free_msdu_id(struct ath10k_htt *htt, u16 msdu_id)
{
lockdep_assert_held(&htt->tx_lock);
@@ -47,13 +47,13 @@ void ath10k_htt_tx_free_msdu_id(struct htt_struct *htt, u16
msdu_id)
__clear_bit(msdu_id, htt->used_msdu_ids);
}
-void ath10k_htt_tx_attach(struct htt_struct *htt)
+void ath10k_htt_tx_attach(struct ath10k_htt *htt)
{
spin_lock_init(&htt->tx_lock);
init_waitqueue_head(&htt->empty_tx_wq);
}
-void ath10k_htt_tx_detach(struct htt_struct *htt)
+void ath10k_htt_tx_detach(struct ath10k_htt *htt)
{
return;
}
@@ -61,7 +61,7 @@ void ath10k_htt_tx_detach(struct htt_struct *htt)
void ath10k_htt_htc_tx_complete(void *context, struct sk_buff *skb)
{
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
- struct htt_struct *htt = (struct htt_struct *)context;
+ struct ath10k_htt *htt = (struct ath10k_htt *)context;
if (skb_cb->htt.is_conf) {
dev_kfree_skb_any(skb);
@@ -82,7 +82,7 @@ void ath10k_htt_htc_tx_complete(void *context, struct sk_buff
*skb)
ath10k_txrx_tx_unref(htt, skb);
}
-int ath10k_htt_h2t_ver_req_msg(struct htt_struct *htt)
+int ath10k_htt_h2t_ver_req_msg(struct ath10k_htt *htt)
{
struct sk_buff *skb;
struct htt_cmd *cmd;
@@ -111,7 +111,7 @@ int ath10k_htt_h2t_ver_req_msg(struct htt_struct *htt)
return 0;
}
-int ath10k_htt_send_rx_ring_cfg_ll(struct htt_struct *htt)
+int ath10k_htt_send_rx_ring_cfg_ll(struct ath10k_htt *htt)
{
struct sk_buff *skb;
struct htt_cmd *cmd;
@@ -194,7 +194,7 @@ int ath10k_htt_send_rx_ring_cfg_ll(struct htt_struct *htt)
return 0;
}
-int ath10k_htt_mgmt_tx(struct htt_struct *htt, struct sk_buff *msdu)
+int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
{
struct device *dev = htt->ar->dev;
struct ath10k_skb_cb *skb_cb;
@@ -263,7 +263,7 @@ err:
return res;
}
-int ath10k_htt_tx(struct htt_struct *htt, struct sk_buff *msdu)
+int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
{
struct device *dev = htt->ar->dev;
struct htt_cmd *cmd;
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c
b/drivers/net/wireless/ath/ath10k/txrx.c
index 6a66dc2..8a16b63 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -44,7 +44,7 @@ out:
spin_unlock_bh(&ar->data_lock);
}
-void ath10k_txrx_tx_unref(struct htt_struct *htt, struct sk_buff *txdesc)
+void ath10k_txrx_tx_unref(struct ath10k_htt *htt, struct sk_buff *txdesc)
{
struct device *dev = htt->ar->dev;
struct ieee80211_tx_info *info;
@@ -99,7 +99,7 @@ exit:
dev_kfree_skb_any(txdesc);
}
-void ath10k_txrx_tx_completed(struct htt_struct *htt,
+void ath10k_txrx_tx_completed(struct ath10k_htt *htt,
const struct htt_tx_done *tx_done)
{
struct sk_buff *txdesc;
@@ -351,7 +351,7 @@ int ath10k_wait_for_peer_deleted(struct ath10k *ar, int
vdev_id, const u8 *addr)
return ath10k_wait_for_peer_common(ar, vdev_id, addr, false);
}
-void ath10k_peer_map_event(struct htt_struct *htt,
+void ath10k_peer_map_event(struct ath10k_htt *htt,
struct htt_peer_map_event *ev)
{
struct ath10k *ar = htt->ar;
@@ -378,7 +378,7 @@ exit:
spin_unlock_bh(&ar->data_lock);
}
-void ath10k_peer_unmap_event(struct htt_struct *htt,
+void ath10k_peer_unmap_event(struct ath10k_htt *htt,
struct htt_peer_unmap_event *ev)
{
struct ath10k *ar = htt->ar;
diff --git a/drivers/net/wireless/ath/ath10k/txrx.h
b/drivers/net/wireless/ath/ath10k/txrx.h
index 05bf9d8..8d08c4f 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.h
+++ b/drivers/net/wireless/ath/ath10k/txrx.h
@@ -19,8 +19,8 @@
#include "htt.h"
-void ath10k_txrx_tx_unref(struct htt_struct *htt, struct sk_buff *txdesc);
-void ath10k_txrx_tx_completed(struct htt_struct *htt,
+void ath10k_txrx_tx_unref(struct ath10k_htt *htt, struct sk_buff *txdesc);
+void ath10k_txrx_tx_completed(struct ath10k_htt *htt,
const struct htt_tx_done *tx_done);
void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info);
@@ -29,9 +29,9 @@ struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int
vdev_id,
int ath10k_wait_for_peer_created(struct ath10k *ar, int vdev_id, const u8
*addr);
int ath10k_wait_for_peer_deleted(struct ath10k *ar, int vdev_id, const u8
*addr);
-void ath10k_peer_map_event(struct htt_struct *htt,
+void ath10k_peer_map_event(struct ath10k_htt *htt,
struct htt_peer_map_event *ev);
-void ath10k_peer_unmap_event(struct htt_struct *htt,
+void ath10k_peer_unmap_event(struct ath10k_htt *htt,
struct htt_peer_unmap_event *ev);
#endif
--
1.7.9.5
_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
