fix compile warnings for gcc 6.2.0

[open-ath9k-htc-firmware.git] / target_firmware / wlan / if_owl.c

diff --git a/target_firmware/wlan/if_owl.c b/target_firmware/wlan/if_owl.c
index c1bca506e4b0c2ce415078bda360414e1c46281e..35b037c471a85667be03779cd3f724a8bcad0e1e 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -57,6 +57,7 @@
 #include "if_athrate.h"
 #include "if_athvar.h"
 #include "ah_desc.h"
+#include "ah_internal.h"
 
 #define ath_tgt_free_skb  adf_nbuf_free
 
@@ -147,6 +148,8 @@ static void ath_tx_comp_cleanup(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 int ath_tgt_tx_add_to_aggr(struct ath_softc_tgt *sc,
                           struct ath_buf *bf,int datatype,
                           ath_atx_tid_t *tid, int is_burst);
+int ath_tgt_tx_form_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid,
+                        ath_tx_bufhead *bf_q);
 
 struct ieee80211_frame *ATH_SKB_2_WH(adf_nbuf_t skb)
 {
@@ -556,6 +559,8 @@ void ath_tx_status_update(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
        if (txs == NULL)
                return;
 
+       txs->txstatus[txs->cnt].ts_flags = 0;
+
        txs->txstatus[txs->cnt].cookie = bf->bf_cookie;
        txs->txstatus[txs->cnt].ts_rate = SM(bf->bf_endpt, ATH9K_HTC_TXSTAT_EPID);
 
@@ -895,7 +900,7 @@ static void ath_tgt_txq_add_ucast(struct ath_softc_tgt *sc, struct ath_tx_buf *b
        } else {
                *txq->axq_link = ATH_BUF_GET_DESC_PHY_ADDR(bf);
 
-               txe_val = OS_REG_READ(ah, 0x840);
+               txe_val = ioread32_mac(0x0840);
                if (!(txe_val & (1<< txq->axq_qnum)))
                        ah->ah_setTxDP(ah, txq->axq_qnum, ATH_BUF_GET_DESC_PHY_ADDR(bf));
        }
@@ -988,8 +993,8 @@ ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
 
        for (bfd = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; bfd++, i++) {
                ah->ah_clr11nAggr(bfd);
-               ah->ah_set11nBurstDuration(ah, bfd, 0);
-               ah->ah_set11nVirtualMoreFrag(ah, bfd, 0);
+               ah->ah_set11nBurstDuration(bfd, 0);
+               ah->ah_set11nVirtualMoreFrag(bfd, 0);
        }
 
        ath_dma_unmap(sc, bf);
@@ -1808,8 +1813,8 @@ ath_tx_retry_subframe(struct ath_softc_tgt *sc, struct ath_tx_buf *bf,
 
        for(ds = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; ds++, i++) {
                ah->ah_clr11nAggr(ds);
-               ah->ah_set11nBurstDuration(ah, ds, 0);
-               ah->ah_set11nVirtualMoreFrag(ah, ds, 0);
+               ah->ah_set11nBurstDuration(ds, 0);
+               ah->ah_set11nVirtualMoreFrag(ds, 0);
        }
 
        if (bf->bf_retries >= OWLMAX_RETRIES) {