ChangeSet 1.1760.26.6, 2004/06/24 10:21:34-07:00, [EMAIL PROTECTED]
[PATCH] USB: usb ethernet gadget build fixes on PXA
Build fixes for ethernet gadget on PXA.
From: Frank Neuber <[EMAIL PROTECTED]>
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/gadget/ether.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -Nru a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
--- a/drivers/usb/gadget/ether.c 2004-06-29 16:26:27 -07:00
+++ b/drivers/usb/gadget/ether.c 2004-06-29 16:26:27 -07:00
@@ -234,7 +234,7 @@
/* For CDC-incapable hardware, choose the simple cdc subset.
* Anything that talks bulk (without notable bugs) can do this.
*/
-#ifdef CONFIG_USB_GADGET_PXA
+#ifdef CONFIG_USB_GADGET_PXA2XX
#define DEV_CONFIG_SUBSET
#endif
@@ -2373,6 +2373,7 @@
EP_OUT_NAME = ep->name;
ep->driver_data = ep; /* claim */
+#if defined(DEV_CONFIG_CDC) || defined(CONFIG_USB_ETH_RNDIS)
/* CDC Ethernet control interface doesn't require a status endpoint.
* Since some hosts expect one, try to allocate one anyway.
*/
@@ -2386,13 +2387,12 @@
"can't run RNDIS on %s\n",
gadget->name);
return -ENODEV;
-#ifdef DEV_CONFIG_CDC
} else if (cdc) {
control_intf.bNumEndpoints = 0;
/* FIXME remove endpoint from descriptor list */
-#endif
}
}
+#endif
/* one config: cdc, else minimal subset */
if (!cdc) {
@@ -2446,7 +2446,7 @@
/* Module params for these addresses should come from ID proms.
* The host side address is used with CDC and RNDIS, and commonly
- * end ups in a persistent config database.
+ * ends up in a persistent config database.
*/
get_ether_addr(dev_addr, net->dev_addr);
if (cdc || rndis) {
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
