remove unused variables in ah_set11nTxDesc

[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 31a4ab4ebcaa87b5b9e84eade8a9a4fbbe314bf0..1806447895a3190432020e86c88052d0241f028d 100755 (executable)
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@ -253,7 +253,7 @@ static void ath_filltxdesc(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
                } else
                        ds->ds_link = ATH_BUF_GET_DESC_PHY_ADDR_WITH_IDX(bf, i+1);
 
-               ah->ah_fillTxDesc(ah, ds
+               ah->ah_fillTxDesc(ds
                                   , bf->bf_dmamap_info.dma_segs[i].len
                                   , i == 0
                                   , i == (bf->bf_dmamap_info.nsegs - 1)
@@ -277,7 +277,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
@@ -387,7 +387,7 @@ static void ath_buf_set_rate(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
            cix = rt->info[sc->sc_protrix].controlRate;
            prot_mode = AH_TRUE;
     } else {
-           if (ath_hal_htsupported(ah) && (!bf->bf_ismcast))
+           if (ath_hal_getcapability(ah, HAL_CAP_HT) && (!bf->bf_ismcast))
                    flags = HAL_TXDESC_RTSENA;
 
            for (i = 4; i--;) {
@@ -651,6 +651,7 @@ void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,
 {
        struct ath_tx_buf *bf;
        struct ath_tx_desc *ds;
+       struct ath_hal *ah = sc->sc_ah;
        HAL_STATUS status;
 
        for (;;) {
@@ -663,7 +664,7 @@ void owltgt_tx_processq(struct ath_softc_tgt *sc, struct ath_txq *txq,
                bf = asf_tailq_first(&txq->axq_q);
 
                ds = bf->bf_lastds;
-               status = ath_hal_txprocdesc(sc->sc_ah, ds);
+               status = ah->ah_procTxDesc(ah, ds);
 
                if (status == HAL_EINPROGRESS) {
                        if (txqstate == OWL_TXQ_ACTIVE)
@@ -886,7 +887,7 @@ static void ath_tgt_txq_add_ucast(struct ath_softc_tgt *sc, struct ath_tx_buf *b
 
        txq = bf->bf_txq;
 
-       status = ath_hal_txprocdesc(sc->sc_ah, bf->bf_lastds);
+       status = ah->ah_procTxDesc(ah, bf->bf_lastds);
 
        ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
 
@@ -989,7 +990,7 @@ 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(ah, bfd);
                ah->ah_set11nBurstDuration(ah, bfd, 0);
-               ath_hal_set11n_virtualmorefrag(sc->sc_ah, bfd, 0);
+               ah->ah_set11nVirtualMoreFrag(ah, bfd, 0);
        }
 
        ath_dma_unmap(sc, bf);
@@ -1051,7 +1052,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
        struct ath_vap_target *avp;
        struct ath_hal *ah = sc->sc_ah;
        a_uint8_t rix, txrate, ctsrate, cix = 0xff, *data;
-       a_uint32_t ivlen = 0, icvlen = 0, subtype, flags, ctsduration;
+       a_uint32_t subtype, flags, ctsduration;
        a_int32_t i, iswep, ismcast, hdrlen, pktlen, try0, len;
        struct ath_tx_desc *ds=NULL;
        struct ath_txq *txq=NULL;
@@ -1200,20 +1201,16 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
 
        flags |= HAL_TXDESC_INTREQ;
 
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , pktlen
                            , hdrlen
                            , atype
                            , 60
                            , txrate, try0
                            , keyix
-                           , 0
                            , flags
                            , ctsrate
-                           , ctsduration
-                           , icvlen
-                           , ivlen
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , ctsduration);
 
        bf->bf_flags = flags;
 
@@ -1222,8 +1219,8 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
         * in Auth frame 3 of Shared Authentication, owl needs this.
         */
        if (iswep && (keyix != HAL_TXKEYIX_INVALID) &&
-           (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_AUTH)
-               ath_hal_fillkeytxdesc(ah, ds, mh->keytype);
+                       (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_AUTH)
+               ah->ah_fillKeyTxDesc(ds, mh->keytype);
 
        ath_filltxdesc(sc, bf);
 
@@ -1813,7 +1810,7 @@ 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(ah, ds);
                ah->ah_set11nBurstDuration(ah, ds, 0);
-               ath_hal_set11n_virtualmorefrag(sc->sc_ah, ds, 0);
+               ah->ah_set11nVirtualMoreFrag(ah, ds, 0);
        }
 
        if (bf->bf_retries >= OWLMAX_RETRIES) {
@@ -2128,7 +2125,7 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
        adf_nbuf_dmamap_info(bf->bf_dmamap, &bf->bf_dmamap_info);
 
        ds = bf->bf_desc;
-       ah->ah_setupTxDesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , 0
                            , HAL_PKT_TYPE_NORMAL
@@ -2136,11 +2133,9 @@ static void ath_bar_tx(struct ath_softc_tgt *sc,
                            , min_rate
                            , ATH_TXMAXTRY
                            , bf->bf_keyix
-                           , 0
                            , HAL_TXDESC_INTREQ
                            | HAL_TXDESC_CLRDMASK
-                           , 0, 0, 0, 0
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , 0, 0);
 
        skbhead = bf->bf_skbhead;
        bf->bf_isaggr = 0;