[kernel] r14337 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Oct  5 02:08:38 2009
New Revision: 14337

Log:
sis190: Correct DMA sync handling on small packets (Closes: #541169)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/sis190-correct-dma-sync-small-packets.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/20

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon Oct  5 01:01:26 2009	(r14336)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Oct  5 02:08:38 2009	(r14337)
@@ -13,6 +13,7 @@
     (Closes: #545999)
   * nfs: Avoid overrun when copying client IP address string
     (Closes: #549002)
+  * sis190: Correct DMA sync handling on small packets (Closes: #541169)
 
   [ dann frazier ]
   * autofs4: don't make expiring dentry negative, avoiding an oops

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/sis190-correct-dma-sync-small-packets.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/sis190-correct-dma-sync-small-packets.patch	Mon Oct  5 02:08:38 2009	(r14337)
@@ -0,0 +1,35 @@
+From 744c6b2976778ac6944e580fc413842df85be84e Mon Sep 17 00:00:00 2001
+From: Riccardo Ghetta <birrachiara at tin.it>
+Date: Sun, 7 Jun 2009 19:47:58 +0000
+Subject: [PATCH] sis190: fix for x86_64 (bug 11509)
+
+Corrected dma sync handling on small packets. Should fix
+http://bugzilla.kernel.org/show_bug.cgi?id=11509
+Note:
+While this bug was reported only on x86_64, it could have affected
+any architecture.
+
+Signed-off-by: Riccardo Ghetta <birrachiara at tin.it>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/sis190.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
+index 13b8ca4..9ea13c0 100644
+--- a/drivers/net/sis190.c
++++ b/drivers/net/sis190.c
+@@ -539,8 +539,8 @@ static bool sis190_try_rx_copy(struct sis190_private *tp,
+ 	if (!skb)
+ 		goto out;
+ 
+-	pci_dma_sync_single_for_device(tp->pci_dev, addr, pkt_size,
+-				       PCI_DMA_FROMDEVICE);
++	pci_dma_sync_single_for_cpu(tp->pci_dev, addr, tp->rx_buf_sz,
++				PCI_DMA_FROMDEVICE);
+ 	skb_reserve(skb, 2);
+ 	skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size);
+ 	*sk_buff = skb;
+-- 
+1.6.4.3
+

Modified: dists/lenny/linux-2.6/debian/patches/series/20
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/20	Mon Oct  5 01:01:26 2009	(r14336)
+++ dists/lenny/linux-2.6/debian/patches/series/20	Mon Oct  5 02:08:38 2009	(r14337)
@@ -5,4 +5,5 @@
 + bugfix/all/virtio_balloon-fix-towards_target-when-deflating.patch
 + bugfix/all/dm-snapshot-fix-primary_pe-race.patch
 + bugfix/all/fs-nfs-avoid-overrun-copying-client-ip.patch
++ bugfix/all/sis190-correct-dma-sync-small-packets.patch
 + features/all/ftdi_sio-openrd.patch