diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-03-26 11:48:20 -0400 |
---|---|---|
committer | Luis Henriques <luis.henriques@canonical.com> | 2012-05-01 06:00:02 -0400 |
commit | afc566763446a24a9406a65b3f4b7336296abb5b (patch) | |
tree | acf467128d743b0b29e14fc857c7f34189a0672a /drivers/net/wireless/rtlwifi/pci.c | |
parent | 257a4c13192e6d9c0a1492366cef065b3e02413a (diff) |
rtlwifi: Add missing DMA buffer unmapping for PCI drivers
BugLink: http://bugs.launchpad.net/bugs/987283
commit 673f7786e205c87b5d978c62827b9a66d097bebb upstream.
In https://bugzilla.kernel.org/show_bug.cgi?id=42976, a system with driver
rtl8192se used as an AP suffers from "Out of SW-IOMMU space" errors. These
are caused by the DMA buffers used for beacons never being unmapped.
This bug was also reported at
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/961618
Reported-and-Tested-by: Da Xue <da@lessconfused.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 6c56198e26b..61291a18ad4 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -954,8 +954,13 @@ static void _rtl_pci_prepare_bcn_tasklet(struct ieee80211_hw *hw) | |||
954 | memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc)); | 954 | memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc)); |
955 | ring = &rtlpci->tx_ring[BEACON_QUEUE]; | 955 | ring = &rtlpci->tx_ring[BEACON_QUEUE]; |
956 | pskb = __skb_dequeue(&ring->queue); | 956 | pskb = __skb_dequeue(&ring->queue); |
957 | if (pskb) | 957 | if (pskb) { |
958 | struct rtl_tx_desc *entry = &ring->desc[ring->idx]; | ||
959 | pci_unmap_single(rtlpci->pdev, rtlpriv->cfg->ops->get_desc( | ||
960 | (u8 *) entry, true, HW_DESC_TXBUFF_ADDR), | ||
961 | pskb->len, PCI_DMA_TODEVICE); | ||
958 | kfree_skb(pskb); | 962 | kfree_skb(pskb); |
963 | } | ||
959 | 964 | ||
960 | /*NB: the beacon data buffer must be 32-bit aligned. */ | 965 | /*NB: the beacon data buffer must be 32-bit aligned. */ |
961 | pskb = ieee80211_beacon_get(hw, mac->vif); | 966 | pskb = ieee80211_beacon_get(hw, mac->vif); |