build fix: ath_txq_add_fn_t and ath_tx_comp_fn_t use ath_tx_buf

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_athvar.h

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index f5ac24fb28753ebe821c5f69ae26357ea2e187cf..363368509deda313327a0dbd8b2573db93366464 100755 (executable)
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -146,8 +146,10 @@ struct ath_txq;
 #define ath_free_rx_skb(_sc,_skb)                   BUF_Pool_free_buf(_sc->pool_handle, POOL_ID_WLAN_RX_BUF, _skb)
 #define ath_free_tx_skb(_htc_handle, endpt, _skb)   HTC_ReturnBuffers(_htc_handle, endpt, _skb);
 
-typedef void (*ath_txq_add_fn_t)(struct ath_softc_tgt *sc, struct ath_buf *bf);
-typedef void (*ath_tx_comp_fn_t)(struct ath_softc_tgt *sc, struct ath_buf *bf);
+struct ath_tx_buf;
+
+typedef void (*ath_txq_add_fn_t)(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
+typedef void (*ath_tx_comp_fn_t)(struct ath_softc_tgt *sc, struct ath_tx_buf *bf);
 
 struct ath_buf_state {
        ath_tx_comp_fn_t        bfs_comp;           /* completion function          */
@@ -194,26 +196,30 @@ struct ath_buf_state {
 #define bf_retries        bf_state.bfs_retries
 
 #define ATH_GENERIC_BUF                     \
-    struct ath_buf        *bf_next;        \
-    struct ath_desc       *bf_desc;        \
-    struct ath_desc       *bf_descarr;     \
     adf_os_dma_map_t      bf_dmamap;       \
     adf_os_dmamap_info_t  bf_dmamap_info;   \
     struct ieee80211_node_target *bf_node;  \
     adf_nbuf_queue_t      bf_skbhead;      \
-    adf_nbuf_t            bf_skb;          \
-    struct ath_desc      *bf_lastds;
+    adf_nbuf_t            bf_skb;
 
 struct ath_buf
 {
     ATH_GENERIC_BUF
     asf_tailq_entry(ath_buf)  bf_list;
+    struct ath_buf        *bf_next;
+    struct ath_desc      *bf_lastds;
+    struct ath_desc       *bf_desc;
+    struct ath_desc       *bf_descarr;
 };
 
 struct ath_tx_buf
 {
        ATH_GENERIC_BUF
        asf_tailq_entry(ath_tx_buf)  bf_list;
+       struct ath_tx_buf            *bf_next;
+       struct ath_tx_desc           *bf_desc;
+       struct ath_tx_desc           *bf_descarr;
+       struct ath_tx_desc           *bf_lastds;
        struct ath_buf_state  bf_state;
        a_uint16_t            bf_flags;
        HTC_ENDPOINT_ID       bf_endpt;
@@ -225,11 +231,15 @@ struct ath_rx_buf
 {
        ATH_GENERIC_BUF
        asf_tailq_entry(ath_rx_buf)  bf_list;
+       struct ath_rx_buf            *bf_next;
+       struct ath_rx_desc           *bf_desc;
+       struct ath_rx_desc           *bf_descarr;
+       struct ath_rx_desc           *bf_lastds;
        a_uint32_t            bf_status;
        struct ath_rx_status  bf_rx_status;
 };
 
-#define ATH_BUF_GET_DESC_PHY_ADDR(bf)                       bf->bf_desc
+#define ATH_BUF_GET_DESC_PHY_ADDR(bf)                       (a_uint32_t)bf->bf_desc
 #define ATH_BUF_GET_DESC_PHY_ADDR_WITH_IDX(bf, idx)         (adf_os_dma_addr_t)(&bf->bf_descarr[idx])
 #define ATH_BUF_SET_DESC_PHY_ADDR(bf, addr)
 #define ATH_BUF_SET_DESC_PHY_ADDR_WITH_IDX(bf, idx, addr)
@@ -295,7 +305,7 @@ struct ath_descdma {
 struct ath_txq {
        a_uint32_t           axq_qnum;
        a_uint32_t           *axq_link;
-       asf_tailq_head(,ath_buf) axq_q;
+       asf_tailq_head(,ath_tx_buf) axq_q;
        a_uint32_t           axq_depth;
        struct  ath_buf     *axq_linkbuf;
        asf_tailq_head(,ath_atx_tid) axq_tidq;
@@ -389,7 +399,7 @@ struct ath_softc_tgt
        ath_deschead       sc_rxdesc;
        struct ath_rx_desc    *sc_rxdesc_held;
 
-       struct ath_buf    *sc_txbuf_held;
+       struct ath_tx_buf    *sc_txbuf_held;
 
        struct ath_descdma  sc_rxdma;
        struct ath_descdma  sc_txdma;