diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 09:41:49 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-02-08 09:41:49 +0000 |
| commit | 246a6a89cab449634826274156bd267756bc27c5 (patch) | |
| tree | 127a20abf98b1fbeac892f289ff402e4a9ca3514 /package/mac80211/patches/320-rx_dma_unmap.patch | |
| parent | d6a031f60c3da9cd19204ca5a3b72a0d83e427cf (diff) | |
| download | upstream-246a6a89cab449634826274156bd267756bc27c5.tar.gz upstream-246a6a89cab449634826274156bd267756bc27c5.tar.bz2 upstream-246a6a89cab449634826274156bd267756bc27c5.zip | |
[package] mac80211: update compat-wireless to 2009-02-07
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14434 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/320-rx_dma_unmap.patch')
| -rw-r--r-- | package/mac80211/patches/320-rx_dma_unmap.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/package/mac80211/patches/320-rx_dma_unmap.patch b/package/mac80211/patches/320-rx_dma_unmap.patch deleted file mode 100644 index a22320a6f4..0000000000 --- a/package/mac80211/patches/320-rx_dma_unmap.patch +++ /dev/null @@ -1,37 +0,0 @@ -When freeing rx dma descriptors, use the right buffer size. -Fixes kernel oopses on module unload on ixp4xx and most likely -other platforms as well. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> - ---- a/drivers/net/wireless/ath5k/base.c -+++ b/drivers/net/wireless/ath5k/base.c -@@ -310,6 +310,19 @@ static inline void ath5k_txbuf_free(stru - bf->skb = NULL; - } - -+static inline void ath5k_rxbuf_free(struct ath5k_softc *sc, -+ struct ath5k_buf *bf) -+{ -+ BUG_ON(!bf); -+ if (!bf->skb) -+ return; -+ pci_unmap_single(sc->pdev, bf->skbaddr, sc->rxbufsize, -+ PCI_DMA_FROMDEVICE); -+ dev_kfree_skb_any(bf->skb); -+ bf->skb = NULL; -+} -+ -+ - /* Queues setup */ - static struct ath5k_txq *ath5k_txq_setup(struct ath5k_softc *sc, - int qtype, int subtype); -@@ -1343,7 +1356,7 @@ ath5k_desc_free(struct ath5k_softc *sc, - list_for_each_entry(bf, &sc->txbuf, list) - ath5k_txbuf_free(sc, bf); - list_for_each_entry(bf, &sc->rxbuf, list) -- ath5k_txbuf_free(sc, bf); -+ ath5k_rxbuf_free(sc, bf); - - /* Free memory associated with all descriptors */ - pci_free_consistent(pdev, sc->desc_len, sc->desc, sc->desc_daddr); |