summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlepton <ytht.net@gmail.com>2005-08-22 17:06:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 19:59:38 -0700
commit2bbfb16bf345acd81ab1e6e3d4b35964650517ac (patch)
tree7eeecfe2e5df567d1d725fae962ddf1faabb90a5
parentb1daec3089a129a67169d3ae975985a7480fe17f (diff)
downloadlinux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.tar.gz
linux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.tar.bz2
linux-2bbfb16bf345acd81ab1e6e3d4b35964650517ac.zip
[PATCH] usbnet oops fix
There's a "return the wrong SKB" error in the GL620A cable minidriver (for "usbnet") which can oops. This would not appear when talking Linux-to-Linux, only Linux-to-Windows (for recent Linuxes). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/usb/net/usbnet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 576f3b852fce..4528a00c45b0 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
// 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