use ah_stopTxDma directly
authorOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 08:08:17 +0000 (10:08 +0200)
committerOleksij Rempel <linux@rempel-privat.de>
Sat, 11 May 2013 14:10:04 +0000 (16:10 +0200)
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
target_firmware/wlan/if_ath.c
target_firmware/wlan/if_athvar.h

index 1059a25007d61e6c0cb278c4101950c77f918a92..f526e4623f4238d9d693e65d1052c9ed64814442 100755 (executable)
@@ -623,7 +623,7 @@ static void ath_tgt_send_beacon(struct ath_softc_tgt *sc, adf_nbuf_t bc_hdr,
        adf_nbuf_dmamap_info(bf->bf_dmamap,&bf->bf_dmamap_info);
 
        ath_beacon_setup(sc, bf, &sc->sc_vap[vap_index]);
-       ath_hal_stoptxdma(ah, sc->sc_bhalq);
+       ah->ah_stopTxDma(ah, sc->sc_bhalq);
        ah->ah_setTxDP(ah, sc->sc_bhalq, ATH_BUF_GET_DESC_PHY_ADDR(bf));
        ah->ah_startTxDma(ah, sc->sc_bhalq);
 }
@@ -636,7 +636,7 @@ static void ath_tx_stopdma(struct ath_softc_tgt *sc, struct ath_txq *txq)
 {
        struct ath_hal *ah = sc->sc_ah;
 
-       (void) ath_hal_stoptxdma(ah, txq->axq_qnum);
+       ah->ah_stopTxDma(ah, txq->axq_qnum);
 }
 
 static void owltgt_txq_drain(struct ath_softc_tgt *sc, struct ath_txq *txq)
@@ -659,7 +659,7 @@ static void ath_draintxq(struct ath_softc_tgt *sc, HAL_BOOL drain_softq)
        ath_tx_status_clear(sc);
        sc->sc_tx_draining = 1;
 
-       (void) ath_hal_stoptxdma(ah, sc->sc_bhalq);
+       ah->ah_stopTxDma(ah, sc->sc_bhalq);
 
        for (i = 0; i < HAL_NUM_TX_QUEUES; i++)
                if (ATH_TXQ_SETUP(sc, i))
@@ -1595,7 +1595,7 @@ static void ath_stop_tx_dma_tgt(void *Context, A_UINT16 Command,
                q = *(a_uint32_t *)data;
 
        q = adf_os_ntohl(q);
-       ath_hal_stoptxdma(ah, q);
+       ah->ah_stopTxDma(ah, q);
        wmi_cmd_rsp(sc->tgt_wmi_handle, Command, SeqNo, NULL, 0);
 }
 
index 4bd3b416857f6981d77deb19c1bf75b55a83705d..04e4e3703d69a7a778774a9150290804fcb1985e 100755 (executable)
@@ -499,8 +499,6 @@ a_uint8_t ath_get_minrateidx(struct ath_softc_tgt *sc, struct ath_vap_target *av
     ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
 #define ath_hal_rxprocdescfast(_ah, _ds, _dspa, _dsnext, _rx_stats) \
     ((*(_ah)->ah_procRxDescFast)((_ah), (_ds), (_dspa), (_dsnext), (_rx_stats)))
-#define ath_hal_stoptxdma(_ah, _qnum) \
-    ((*(_ah)->ah_stopTxDma)((_ah), (_qnum)))
 #define ath_hal_aborttxdma(_ah) \
     ((*(_ah)->ah_abortTxDma)(_ah))
 #define ath_hal_set11n_txdesc(_ah, _ds, _pktlen, _type, _txpower,\