remove unused variable in ah_fillTxDesc

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

diff --git a/target_firmware/wlan/if_ath.c b/target_firmware/wlan/if_ath.c
index 6186f670f0f77de6407fb393fbcc91419587513d..72cbda8cb335cce2d0a275bdbf0ca5e3f4a7ce4d 100755 (executable)
--- a/target_firmware/wlan/if_ath.c
+++ b/target_firmware/wlan/if_ath.c
@@ -80,17 +80,6 @@ void owl_tgt_node_init(struct ath_node_target * an);
 void ath_tgt_tx_sched_normal(struct ath_softc_tgt *sc, struct ath_buf *bf);
 void ath_tgt_tx_sched_nonaggr(struct ath_softc_tgt *sc,struct ath_buf * bf_host);
 
-/*************/
-/* Utilities */
-/*************/
-
-#undef adf_os_cpu_to_le16
-
-static a_uint16_t adf_os_cpu_to_le16(a_uint16_t x)
-{
-       return ((((x) & 0xff00) >> 8) |   (((x) & 0x00ff) << 8));
-}
-
 /*
  * Extend a 32 bit TSF to 64 bit, taking wrapping into account.
  */
@@ -266,9 +255,7 @@ static a_int32_t ath_rxdesc_init(struct ath_softc_tgt *sc, struct ath_rx_desc *d
        ds->ds_link = 0;
        adf_nbuf_peek_header(ds->ds_nbuf, &anbdata, &anblen);
 
-       ah->ah_setupRxDesc(ah, ds,
-                           adf_nbuf_tailroom(ds->ds_nbuf),
-                           0);
+       ah->ah_setupRxDesc(ds, adf_nbuf_tailroom(ds->ds_nbuf), 0);
 
        if (sc->sc_rxlink == NULL) {
                ah->ah_setRxDP(ah, ds->ds_daddr);
@@ -555,22 +542,18 @@ static void ath_beacon_setup(struct ath_softc_tgt *sc,
        rt  = sc->sc_currates;
        rate = rt->info[rix].rateCode;
 
-       ath_hal_setuptxdesc(ah, ds
+       ah->ah_setupTxDesc(ds
                            , adf_nbuf_len(skb) + IEEE80211_CRC_LEN
                            , sizeof(struct ieee80211_frame)
                            , HAL_PKT_TYPE_BEACON
                            , MAX_RATE_POWER
                            , rate, 1
                            , HAL_TXKEYIX_INVALID
-                           , 0
                            , flags
                            , 0
-                           , 0
-                           , 0
-                           , 0
-                           , ATH_COMP_PROC_NO_COMP_NO_CCS);
+                           , 0);
 
-       ath_hal_filltxdesc(ah, ds
+       ah->ah_fillTxDesc(ds
                           , asf_roundup(adf_nbuf_len(skb), 4)
                           , AH_TRUE
                           , AH_TRUE
@@ -1143,7 +1126,7 @@ static void ath_init_tgt(void *Context, A_UINT16 Command,
 
        sc->sc_imask |= HAL_INT_GTT;
 
-       if (ath_hal_htsupported(ah))
+       if (ath_hal_getcapability(ah, HAL_CAP_HT))
                sc->sc_imask |= HAL_INT_CST;
 
        adf_os_setup_intr(sc->sc_dev, ath_intr);