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

Commit e86600c7 authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

Ath5k: fix dma operation 



Don't sync
- coherent mapping (descriptors)
- before unmap, it's useless
- (wrongly anyway -- for_cpu) beacon skb, it's just mapped,
  so by the device yet

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Cc: Luis R. Rodriguez <mcgrof@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 274c7c36

drivers/net/wireless/ath5k/base.c

+0 −11
Original line number Diff line number Diff line
@@ -1704,10 +1704,6 @@ ath5k_tasklet_rx(unsigned long data) 
		skb = bf->skb;

		ds = bf->desc;



		/* TODO only one segment */

		pci_dma_sync_single_for_cpu(sc->pdev, sc->desc_daddr,

				sc->desc_len, PCI_DMA_FROMDEVICE);



		/*

		 * last buffer must not be freed to ensure proper hardware

		 * function. When the hardware finishes also a packet next to
@@ -1771,8 +1767,6 @@ ath5k_tasklet_rx(unsigned long data) 
				goto next;

		}

accept:

		pci_dma_sync_single_for_cpu(sc->pdev, bf->skbaddr,

				rs.rs_datalen, PCI_DMA_FROMDEVICE);

		pci_unmap_single(sc->pdev, bf->skbaddr, sc->rxbufsize,

				PCI_DMA_FROMDEVICE);

		bf->skb = NULL;
@@ -1860,9 +1854,6 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq) 
	list_for_each_entry_safe(bf, bf0, &txq->q, list) {

		ds = bf->desc;



		/* TODO only one segment */

		pci_dma_sync_single_for_cpu(sc->pdev, sc->desc_daddr,

				sc->desc_len, PCI_DMA_FROMDEVICE);

		ret = sc->ah->ah_proc_tx_desc(sc->ah, ds, &ts);

		if (unlikely(ret == -EINPROGRESS))

			break;
@@ -2035,8 +2026,6 @@ ath5k_beacon_send(struct ath5k_softc *sc) 
		ATH5K_WARN(sc, "beacon queue %u didn't stop?\n", sc->bhalq);

		/* NB: hw still stops DMA, so proceed */

	}

	pci_dma_sync_single_for_cpu(sc->pdev, bf->skbaddr, bf->skb->len,

			PCI_DMA_TODEVICE);



	ath5k_hw_put_tx_buf(ah, sc->bhalq, bf->daddr);

	ath5k_hw_tx_start(ah, sc->bhalq);