The patch titled
tc35815: fix an usage of streaming DMA API
has been removed from the -mm tree. Its filename was
tc35815-fix-an-usage-of-streaming-dma-api.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: tc35815: fix an usage of streaming DMA API
From: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
The tc35815 driver lacks a call to pci_dma_sync_single_for_device() on
receiving. Recent fix of MIPS dma_sync_single_for_cpu() reveal this bug.
Signed-off-by: Atsushi Nemoto <anemo@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/tc35815.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff -puN drivers/net/tc35815.c~tc35815-fix-an-usage-of-streaming-dma-api drivers/net/tc35815.c
--- a/drivers/net/tc35815.c~tc35815-fix-an-usage-of-streaming-dma-api
+++ a/drivers/net/tc35815.c
@@ -58,12 +58,13 @@
* 1.34 Fix netpoll locking. "BH rule" for NAPI is not enough with
* netpoll, hard_start_xmit might be called from irq context.
* PM support.
+ * 1.35 Fix an usage of streaming DMA API.
*/
#ifdef TC35815_NAPI
-#define DRV_VERSION "1.34-NAPI"
+#define DRV_VERSION "1.35-NAPI"
#else
-#define DRV_VERSION "1.34"
+#define DRV_VERSION "1.35"
#endif
static const char *version = "tc35815.c:v" DRV_VERSION "\n";
#define MODNAME "tc35815"
@@ -1551,6 +1552,11 @@ tc35815_rx(struct net_device *dev)
PCI_DMA_FROMDEVICE);
#endif
memcpy(data + offset, rxbuf, len);
+#ifdef TC35815_DMA_SYNC_ONDEMAND
+ pci_dma_sync_single_for_device(lp->pci_dev,
+ dma, len,
+ PCI_DMA_FROMDEVICE);
+#endif
offset += len;
cur_bd++;
}
_
Patches currently in -mm which might be from anemo@xxxxxxxxxxxxx are
spi-at25-do-not-use-pointer-before-assignment.patch
git-kbuild.patch
git-netdev-all.patch
8139too-fix-irq-problem-with-napi-netpoll.patch
x86_64-fix-section-mismatch-warnings.patch
serial-allocate-minor-device-numbers-for.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
