3.2-stable patches

added patches:
	rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch

diff --git a/queue-3.2/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch b/queue-3.2/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch
new file mode 100644 (file)
index 0000000..dc41385
--- /dev/null
+++ b/queue-3.2/rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch
@@ -0,0 +1,42 @@
+From 673f7786e205c87b5d978c62827b9a66d097bebb Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@lwfinger.net>
+Date: Mon, 26 Mar 2012 10:48:20 -0500
+Subject: rtlwifi: Add missing DMA buffer unmapping for PCI drivers
+
+From: Larry Finger <Larry.Finger@lwfinger.net>
+
+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>
+
+---
+ drivers/net/wireless/rtlwifi/pci.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/rtlwifi/pci.c
++++ b/drivers/net/wireless/rtlwifi/pci.c
+@@ -926,8 +926,13 @@ static void _rtl_pci_prepare_bcn_tasklet
+       memset(&tcb_desc, 0, sizeof(struct rtl_tcb_desc));
+       ring = &rtlpci->tx_ring[BEACON_QUEUE];
+       pskb = __skb_dequeue(&ring->queue);
+-      if (pskb)
++      if (pskb) {
++              struct rtl_tx_desc *entry = &ring->desc[ring->idx];
++              pci_unmap_single(rtlpci->pdev, rtlpriv->cfg->ops->get_desc(
++                               (u8 *) entry, true, HW_DESC_TXBUFF_ADDR),
++                               pskb->len, PCI_DMA_TODEVICE);
+               kfree_skb(pskb);
++      }
+ 
+       /*NB: the beacon data buffer must be 32-bit aligned. */
+       pskb = ieee80211_beacon_get(hw, mac->vif);

diff --git a/queue-3.2/series b/queue-3.2/series
index 9a7862d46234aacde19d9d245accdef0104e3c5b..cc04531a6410cab26e1b546a88fecfd0d40818bc 100644 (file)
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -4,3 +4,4 @@ drm-i915-ringbuffer-exclude-last-2-cachlines-of-ring-on-845g.patch
 drm-radeon-only-add-the-mm-i2c-bus-if-the-hw_i2c-module-param-is-set.patch
 drm-i915-properly-compute-dp-dithering-for-user-created-modes.patch
 drm-i915-make-rc6-module-parameter-read-only.patch
+rtlwifi-add-missing-dma-buffer-unmapping-for-pci-drivers.patch