1 From e4e155b8e3aeebb54b4295bce17ef5e85decd44d Mon Sep 17 00:00:00 2001
2 From: merge <null@invalid>
3 Date: Tue, 20 Jan 2009 10:40:16 +0000
4 Subject: [PATCH 2/8] MERGE-via-pending-tracking-hist-subject-usb-gadget-fix-rndis-w
5 pending-tracking-hist top was subject-usb-gadget-fix-rndis-w / 8a5ccc279cef316a16f921d7486f4a9efa234493 ... parent commitmessage:
6 From: David Brownell <dbrownell@users.sourceforge.net>
7 Subject: USB: gadget: fix rndis working at high speed
9 X-Git-Tag: v2.6.28-rc9~8^2~7
10 X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7c12414955e9b44a3e33d54e578bf008caa4475d
12 USB: gadget: fix rndis working at high speed
14 Fix a bug specific to highspeed mode in the recently updated RNDIS
15 support: it wasn't setting up the high speed notification endpoint,
16 which prevented high speed RNDIS links from working.
18 Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
19 Tested-by: Anand Gadiyar <gadiyar@ti.com>
20 Cc: stable <stable@kernel.org>
21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
23 drivers/usb/gadget/f_rndis.c | 4 ++++
24 1 files changed, 4 insertions(+), 0 deletions(-)
26 diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
27 index 428b599..3a8bb53 100644
28 --- a/drivers/usb/gadget/f_rndis.c
29 +++ b/drivers/usb/gadget/f_rndis.c
30 @@ -651,6 +651,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
31 fs_in_desc.bEndpointAddress;
32 hs_out_desc.bEndpointAddress =
33 fs_out_desc.bEndpointAddress;
34 + hs_notify_desc.bEndpointAddress =
35 + fs_notify_desc.bEndpointAddress;
37 /* copy descriptors, and track endpoint copies */
38 f->hs_descriptors = usb_copy_descriptors(eth_hs_function);
39 @@ -662,6 +664,8 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
40 f->hs_descriptors, &hs_in_desc);
41 rndis->hs.out = usb_find_endpoint(eth_hs_function,
42 f->hs_descriptors, &hs_out_desc);
43 + rndis->hs.notify = usb_find_endpoint(eth_hs_function,
44 + f->hs_descriptors, &hs_notify_desc);
47 rndis->port.open = rndis_open;