X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=target_firmware%2Fwlan%2Fif_athvar.h;h=64b7df93c85d93436b655dc35d6dbd67bce95da2;hb=e762f9bdb56051a28818e71754db0156ab30d61b;hp=f5ac24fb28753ebe821c5f69ae26357ea2e187cf;hpb=64675d5a78bd4f578469e4348594f166aa570478;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/if_athvar.h b/target_firmware/wlan/if_athvar.h
index f5ac24f..64b7df9 100755
--- a/target_firmware/wlan/if_athvar.h
+++ b/target_firmware/wlan/if_athvar.h
@@ -194,26 +194,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 +229,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 +303,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 +397,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;