r4079 - in branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2005-08-31 08:33:46 +0000 (Wed, 31 Aug 2005)
New Revision: 4079

Added:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch
Modified:
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
Log:
+  * genelink-usbnet-skb-typo.patch
+    fix gl_skb/skb type error in genelink driver in usbnet
+    Backported From 2.6.12.6


Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-31 08:21:54 UTC (rev 4078)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-08-31 08:33:46 UTC (rev 4079)
@@ -222,6 +222,9 @@
     NPTL signal delivery deadlock fix
     Backported From 2.6.12.6
 
+  * genelink-usbnet-skb-typo.patch
+    fix gl_skb/skb type error in genelink driver in usbnet
+    Backported From 2.6.12.6
 
  -- Simon Horman <horms at debian.org>  Wed, 31 Aug 2005 17:18:43 +0900
 

Added: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch	2005-08-31 08:21:54 UTC (rev 4078)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/genelink-usbnet-skb-typo.dpatch	2005-08-31 08:33:46 UTC (rev 4079)
@@ -0,0 +1,30 @@
+From linux-kernel-owner+chrisw=40osdl.org-S1751397AbVHVWiz at vger.kernel.org  Mon Aug 22 15:40:19 2005
+Date: 	Mon, 22 Aug 2005 14:02:39 +0800
+From: lepton <ytht.net at gmail.com>
+To: dbrownell at users.sourceforge.net
+Cc: linux-kernel at vger.kernel.org
+Subject: [PATCH] fix gl_skb/skb type error in genelink driver in usbnet
+
+I think there is a type error when port genelink driver to 2.6..
+With this error, a linux host will panic when it link with a windows
+host.
+
+Cc: David Brownell <david-b at pacbell.net>
+Signed-off-by: Chris Wright <chrisw at osdl.org>
+---
+ drivers/usb/net/usbnet.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.12.y/drivers/usb/net/usbnet.c
+===================================================================
+--- linux-2.6.12.y.orig/drivers/usb/net/usbnet.c
++++ linux-2.6.12.y/drivers/usb/net/usbnet.c
+@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usb
+ 
+ 			// copy the packet data to the new skb
+ 			memcpy(skb_put(gl_skb, size), packet->packet_data, size);
+-			skb_return (dev, skb);
++			skb_return (dev, gl_skb);
+ 		}
+ 
+ 		// advance to the next packet

Modified: branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17
===================================================================
--- branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:21:54 UTC (rev 4078)
+++ branches/dist/sarge/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-17	2005-08-31 08:33:46 UTC (rev 4079)
@@ -57,3 +57,4 @@
 + fix-dst-leak-in-icmp_push_reply.dpatch
 + nptl-signal-delivery-deadlock-fix.dpatch
 + zlib-revert-broken-change.dpatch
++ genelink-usbnet-skb-typo.patch