From 6a1446a61807fc7ce6f5598b1c5a3c7d2c0eb459 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Thu, 15 Feb 2007 18:50:01 -0800
Subject: [PATCH] --- yaml --- r: 48759 b: refs/heads/master c:
 6e91f527cd0644530894ee3bfb06d209d3c8c54a h: refs/heads/master i:   48757:
 0f7681f3a446d9d152cc5136609cc75ef96f8f84   48755:
 8d22a3cb02ba266a54e0099c4468190d6afee17c   48751:
 f7d49a87f7d24ac26b1a75b2268f62da89d4e0ef v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/usb/net/cdc_subset.c | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1fe316bb2d26..715988ad1e84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6160beb5bfcf8d3cddeecc4e5cd6847621b50893
+refs/heads/master: 6e91f527cd0644530894ee3bfb06d209d3c8c54a
diff --git a/trunk/drivers/usb/net/cdc_subset.c b/trunk/drivers/usb/net/cdc_subset.c
index ae8fb06cf38e..6e3fead26ce1 100644
--- a/trunk/drivers/usb/net/cdc_subset.c
+++ b/trunk/drivers/usb/net/cdc_subset.c
@@ -79,13 +79,19 @@ static int always_connected (struct usbnet *dev)
  *
  * ALi M5632 driver ... does high speed
  *
+ * NOTE that the MS-Windows drivers for this chip use some funky and
+ * (naturally) undocumented 7-byte prefix to each packet, so this is a
+ * case where we don't currently interoperate.  Also, once you unplug
+ * one end of the cable, you need to replug the other end too ... since
+ * chip docs are unavailable, there's no way to reset the relevant state
+ * short of a power cycle.
+ *
  *-------------------------------------------------------------------------*/
 
 static const struct driver_info	ali_m5632_info = {
 	.description =	"ALi M5632",
 };
 
-
 #endif
 
 
@@ -223,6 +229,10 @@ static const struct usb_device_id	products [] = {
 	USB_DEVICE (0x0402, 0x5632),	// ALi defaults
 	.driver_info =	(unsigned long) &ali_m5632_info,
 },
+{
+	USB_DEVICE (0x182d,0x207c),	// SiteCom CN-124
+	.driver_info =	(unsigned long) &ali_m5632_info,
+},
 #endif
 
 #ifdef	CONFIG_USB_AN2720
@@ -314,13 +324,13 @@ static struct usb_driver cdc_subset_driver = {
 
 static int __init cdc_subset_init(void)
 {
- 	return usb_register(&cdc_subset_driver);
+	return usb_register(&cdc_subset_driver);
 }
 module_init(cdc_subset_init);
 
 static void __exit cdc_subset_exit(void)
 {
- 	usb_deregister(&cdc_subset_driver);
+	usb_deregister(&cdc_subset_driver);
 }
 module_exit(cdc_subset_exit);