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 b1d806fe567f1b2085108227f4fb45a1b735ad7b..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)
 {
@@ -277,7 +280,7 @@ static void ath_tx_tgt_setds(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
                break;
        }
 
-       ah->ah_set11nTxDesc(ah, ds
+       ah->ah_set11nTxDesc(ds
                              , bf->bf_pktlen
                              , bf->bf_atype
                              , 60
@@ -372,7 +375,6 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
     HAL_11N_RATE_SERIES series[4];
     a_int32_t i, flags;
     a_uint8_t rix, cix, rtsctsrate;
-    a_uint32_t ctsduration = 0;
     a_int32_t prot_mode = AH_FALSE;
 
     rt = sc->sc_currates;
@@ -444,8 +446,8 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
     rtsctsrate = rt->info[cix].rateCode |
            (bf->bf_shpream ? rt->info[cix].shortPreamble : 0);
 
-    ah->ah_set11nRateScenario(ah, ds, 1,
-                               rtsctsrate, ctsduration,
+    ah->ah_set11nRateScenario(ds, 1,
+                               rtsctsrate,
                                series, 4,
                                flags);
 }
@@ -557,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);
 
@@ -896,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,9 +992,9 @@ ath_tx_freebuf(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
        struct ath_hal *ah = sc->sc_ah;
 
        for (bfd = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; bfd++, i++) {
-               ah->ah_clr11nAggr(ah, bfd);
-               ah->ah_set11nBurstDuration(ah, bfd, 0);
-               ah->ah_set11nVirtualMoreFrag(ah, bfd, 0);
+               ah->ah_clr11nAggr(bfd);
+               ah->ah_set11nBurstDuration(bfd, 0);
+               ah->ah_set11nVirtualMoreFrag(bfd, 0);
        }
 
        ath_dma_unmap(sc, bf);
@@ -1230,7 +1234,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
                series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
                series[i].RateFlags = 0;
        }
-       ah->ah_set11nRateScenario(ah, ds, 0, ctsrate, ctsduration, series, 4, 0);
+       ah->ah_set11nRateScenario(ds, 0, ctsrate, series, 4, 0);
        ath_tgt_txqaddbuf(sc, txq, bf, bf->bf_lastds);
 
        return;
@@ -1409,7 +1413,7 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
                        bf->bf_next = NULL;
 
                        for(ds = bf->bf_desc; ds <= bf->bf_lastds; ds++)
-                               ah->ah_clr11nAggr(ah, ds);
+                               ah->ah_clr11nAggr(ds);
 
                        ath_buf_set_rate(sc, bf);
                        bf->bf_txq_add(sc, bf);
@@ -1423,12 +1427,12 @@ ath_tgt_tx_sched_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid)
 
                bf->bf_isaggr  = 1;
                ath_buf_set_rate(sc, bf);
-               ah->ah_set11nAggrFirst(ah, bf->bf_desc, bf->bf_al,
+               ah->ah_set11nAggrFirst(bf->bf_desc, bf->bf_al,
                                          bf->bf_ndelim);
                bf->bf_lastds = bf_last->bf_lastds;
 
                for (i = 0; i < bf_last->bf_dmamap_info.nsegs; i++)
-                       ah->ah_set11nAggrLast(ah, &bf_last->bf_descarr[i]);
+                       ah->ah_set11nAggrLast(&bf_last->bf_descarr[i]);
 
                if (status == ATH_AGGR_8K_LIMITED) {
                        adf_os_assert(0);
@@ -1573,7 +1577,7 @@ int ath_tgt_tx_form_aggr(struct ath_softc_tgt *sc, ath_atx_tid_t *tid,
                bf_prev = bf;
 
                for(ds = bf->bf_desc; ds <= bf->bf_lastds; ds++)
-                       ah->ah_set11nAggrMiddle(ah, ds, bf->bf_ndelim);
+                       ah->ah_set11nAggrMiddle(ds, bf->bf_ndelim);
 
        } while (!asf_tailq_empty(&tid->buf_q));
 
@@ -1808,9 +1812,9 @@ ath_tx_retry_subframe(struct ath_softc_tgt *sc, struct ath_tx_buf *bf,
        __stats(sc, txaggr_compretries);
 
        for(ds = bf->bf_desc, i = 0; i < bf->bf_dmamap_info.nsegs; ds++, i++) {
-               ah->ah_clr11nAggr(ah, ds);
-               ah->ah_set11nBurstDuration(ah, ds, 0);
-               ah->ah_set11nVirtualMoreFrag(ah, ds, 0);
+               ah->ah_clr11nAggr(ds);
+               ah->ah_set11nBurstDuration(ds, 0);
+               ah->ah_set11nVirtualMoreFrag(ds, 0);
        }
 
        if (bf->bf_retries >= OWLMAX_RETRIES) {
@@ -2142,7 +2146,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        bf->bf_next = NULL;
 
        for (ds0 = ds, i=0; i < bf->bf_dmamap_info.nsegs; ds0++, i++) {
-               ah->ah_clr11nAggr(ah, ds0);
+               ah->ah_clr11nAggr(ds0);
        }
 
        ath_filltxdesc(sc, bf);
@@ -2153,6 +2157,6 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
                series[i].ChSel = sc->sc_ic.ic_tx_chainmask;
        }
 
-       ah->ah_set11nRateScenario(ah, bf->bf_desc, 0, 0, 0, series, 4, 4);
+       ah->ah_set11nRateScenario(bf->bf_desc, 0, 0, series, 4, 4);
        ath_tgt_txq_add_ucast(sc, bf);
 }