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

Commit dd503040 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 38a2f372 332704a5

drivers/net/wireless/ath/ath9k/hif_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, 
	}



	ret = ath9k_htc_hw_init(hif_dev->htc_handle,

				&hif_dev->udev->dev, hif_dev->device_id,

				&interface->dev, hif_dev->device_id,

				hif_dev->udev->product, id->driver_info);

	if (ret) {

		ret = -EINVAL;
@@ -1158,7 +1158,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface) 
#endif



static struct usb_driver ath9k_hif_usb_driver = {

	.name = "ath9k_hif_usb",

	.name = KBUILD_MODNAME,

	.probe = ath9k_hif_usb_probe,

	.disconnect = ath9k_hif_usb_disconnect,

#ifdef CONFIG_PM

drivers/net/wireless/ath/ath9k/hw.c

+0 −9
Original line number Diff line number Diff line
@@ -1254,15 +1254,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	ah->txchainmask = common->tx_chainmask;

	ah->rxchainmask = common->rx_chainmask;



	if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {

		ath9k_hw_abortpcurecv(ah);

		if (!ath9k_hw_stopdmarecv(ah)) {

			ath_dbg(common, ATH_DBG_XMIT,

				"Failed to stop receive dma\n");

			bChannelChange = false;

		}

	}



	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))

		return -EIO;

drivers/net/wireless/ath/ath9k/mac.c

+22 −3
Original line number Diff line number Diff line
@@ -751,28 +751,47 @@ void ath9k_hw_abortpcurecv(struct ath_hw *ah) 
}

EXPORT_SYMBOL(ath9k_hw_abortpcurecv);



bool ath9k_hw_stopdmarecv(struct ath_hw *ah)

bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)

{

#define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */

#define AH_RX_TIME_QUANTUM     100     /* usec */

	struct ath_common *common = ath9k_hw_common(ah);

	u32 mac_status, last_mac_status = 0;

	int i;



	/* Enable access to the DMA observation bus */

	REG_WRITE(ah, AR_MACMISC,

		  ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |

		   (AR_MACMISC_MISC_OBS_BUS_1 <<

		    AR_MACMISC_MISC_OBS_BUS_MSB_S)));



	REG_WRITE(ah, AR_CR, AR_CR_RXD);



	/* Wait for rx enable bit to go low */

	for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) {

		if ((REG_READ(ah, AR_CR) & AR_CR_RXE) == 0)

			break;



		if (!AR_SREV_9300_20_OR_LATER(ah)) {

			mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0;

			if (mac_status == 0x1c0 && mac_status == last_mac_status) {

				*reset = true;

				break;

			}



			last_mac_status = mac_status;

		}



		udelay(AH_TIME_QUANTUM);

	}



	if (i == 0) {

		ath_err(common,

			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x\n",

			"DMA failed to stop in %d ms AR_CR=0x%08x AR_DIAG_SW=0x%08x DMADBG_7=0x%08x\n",

			AH_RX_STOP_DMA_TIMEOUT / 1000,

			REG_READ(ah, AR_CR),

			REG_READ(ah, AR_DIAG_SW));

			REG_READ(ah, AR_DIAG_SW),

			REG_READ(ah, AR_DMADBG_7));

		return false;

	} else {

		return true;

drivers/net/wireless/ath/ath9k/mac.h

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); 
void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);

void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);

void ath9k_hw_abortpcurecv(struct ath_hw *ah);

bool ath9k_hw_stopdmarecv(struct ath_hw *ah);

bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset);

int ath9k_hw_beaconq_setup(struct ath_hw *ah);



/* Interrupt Handling */

drivers/net/wireless/ath/ath9k/recv.c

+3 −3
Original line number Diff line number Diff line
@@ -486,12 +486,12 @@ int ath_startrecv(struct ath_softc *sc) 
bool ath_stoprecv(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;

	bool stopped;

	bool stopped, reset = false;



	spin_lock_bh(&sc->rx.rxbuflock);

	ath9k_hw_abortpcurecv(ah);

	ath9k_hw_setrxfilter(ah, 0);

	stopped = ath9k_hw_stopdmarecv(ah);

	stopped = ath9k_hw_stopdmarecv(ah, &reset);



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)

		ath_edma_stop_recv(sc);
@@ -506,7 +506,7 @@ bool ath_stoprecv(struct ath_softc *sc) 
			"confusing the DMA engine when we start RX up\n");

		ATH_DBG_WARN_ON_ONCE(!stopped);

	}

	return stopped;

	return stopped || reset;

}



void ath_flushrecv(struct ath_softc *sc)