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 19a945cdfcfe49b707e8255b99ff41c40e596df4..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--;) {
@@ -1052,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;
@@ -1201,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;
 
@@ -1224,7 +1220,7 @@ ath_tgt_send_mgt(struct ath_softc_tgt *sc,adf_nbuf_t hdr_buf, adf_nbuf_t skb,
         */
        if (iswep && (keyix != HAL_TXKEYIX_INVALID) &&
                        (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_AUTH)
-               ah->ah_fillKeyTxDesc(ah, ds, mh->keytype);
+               ah->ah_fillKeyTxDesc(ds, mh->keytype);
 
        ath_filltxdesc(sc, bf);
 
@@ -2129,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
@@ -2137,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;