Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8325ed8 authored by Nick Kossifidis's avatar Nick Kossifidis Committed by John W. Linville
Browse files

ath5k: Check RXE when setting RXDP 



 * Make sure we are not trying to set RXDP while RX is active,
 for now ignore the return value.

 Signed-off-by: default avatarNick Kossifidis <mickflemm@gmail.com>

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f7317ba2

drivers/net/wireless/ath/ath5k/ath5k.h

+1 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,7 @@ void ath5k_hw_set_clockrate(struct ath5k_hw *ah); 
void ath5k_hw_start_rx_dma(struct ath5k_hw *ah);

int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah);

u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah);

void ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr);

int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr);

int ath5k_hw_start_tx_dma(struct ath5k_hw *ah, unsigned int queue);

int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue);

u32 ath5k_hw_get_txdp(struct ath5k_hw *ah, unsigned int queue);

drivers/net/wireless/ath/ath5k/dma.c

+9 −2
Original line number Diff line number Diff line
@@ -95,11 +95,18 @@ u32 ath5k_hw_get_rxdp(struct ath5k_hw *ah) 
 * @ah: The &struct ath5k_hw

 * @phys_addr: RX descriptor address

 *

 * XXX: Should we check if rx is enabled before setting rxdp ?

 * Returns -EIO if rx is active

 */

void ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)

int ath5k_hw_set_rxdp(struct ath5k_hw *ah, u32 phys_addr)

{

	if (ath5k_hw_reg_read(ah, AR5K_CR) & AR5K_CR_RXE) {

		ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA,

				"tried to set RXDP while rx was active !\n");

		return -EIO;

	}



	ath5k_hw_reg_write(ah, phys_addr, AR5K_RXDP);

	return 0;

}