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

[Ben Hutchings]

Author: benh
Date: Tue Apr 26 03:02:51 2011
New Revision: 17256

Log:
atl1c: Fix duplication of packet headers when using sendfile (Closes: #623059)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/atl1c-duplicate-atl1c_get_tpd.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/34

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Mon Apr 25 16:23:08 2011	(r17255)
+++ dists/squeeze/linux-2.6/debian/changelog	Tue Apr 26 03:02:51 2011	(r17256)
@@ -53,6 +53,8 @@
     - i915_gem: Return -EFAULT if copy_to_user fails
     - drm/kms: Remove spaces from connector names, so they can be named
       in the 'video' parameter on the kernel command line
+  * atl1c: Fix duplication of packet headers when using sendfile
+    (Closes: #623059)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Apr 2011 01:13:01 +0100
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/atl1c-duplicate-atl1c_get_tpd.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/atl1c-duplicate-atl1c_get_tpd.patch	Tue Apr 26 03:02:51 2011	(r17256)
@@ -0,0 +1,30 @@
+From: Jie Yang <jie.yang at atheros.com>
+Date: Tue, 27 Oct 2009 22:31:19 -0700
+Subject: [PATCH] atl1c: duplicate atl1c_get_tpd
+
+commit 678b77e265f6d66f1e68f3d095841c44ba5ab112 upstream.
+
+remove duplicate atl1c_get_tpd, it may cause hardware to send wrong packets.
+
+Signed-off-by: Jie Yang <jie.yang at atheros.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/atl1c/atl1c_main.c |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
+index 1372e9a..3b8801a 100644
+--- a/drivers/net/atl1c/atl1c_main.c
++++ b/drivers/net/atl1c/atl1c_main.c
+@@ -1981,8 +1981,6 @@ static void atl1c_tx_map(struct atl1c_adapter *adapter,
+ 		else {
+ 			use_tpd = atl1c_get_tpd(adapter, type);
+ 			memcpy(use_tpd, tpd, sizeof(struct atl1c_tpd_desc));
+-			use_tpd = atl1c_get_tpd(adapter, type);
+-			memcpy(use_tpd, tpd, sizeof(struct atl1c_tpd_desc));
+ 		}
+ 		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);
+ 		buffer_info->length = buf_len - mapped_len;
+-- 
+1.7.4.4
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/34
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/34	Mon Apr 25 16:23:08 2011	(r17255)
+++ dists/squeeze/linux-2.6/debian/patches/series/34	Tue Apr 26 03:02:51 2011	(r17256)
@@ -37,3 +37,4 @@
 + bugfix/x86/i915_gem-return-EFAULT-if-copy_to_user-fails.patch
 + bugfix/all/drm-kms-remove-spaces-from-connector-names-v2.patch
 + debian/drm-kms-Temporarily-restore-support-for-name-DisplayPort.patch
++ bugfix/all/atl1c-duplicate-atl1c_get_tpd.patch