diff options
author | Arnd Bergmann <arnd@arndb.de> | 2008-08-23 16:02:23 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-27 05:54:47 -0400 |
commit | 8382cc1c2d0eb8918d3b71bf6cb8ac2e883f3e33 (patch) | |
tree | 0a5cb550ab55e0dda9062f26ce9d5a1a89f9b12b /drivers/net/usb | |
parent | 6fc30db563c57e383ca2ec836d8c9208c52d265a (diff) |
net/usb/mcs7830: new device IDs
This adds USB device IDs for MosChip 7730 and Sitecom LN030
to the mcs7830 driver. The IDs have been reported to work without
further modifications.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: David Brownell <david-b@pacbell.net>
Cc: Viktor Horvath <ViktorHorvath@gmx.net>
Cc: Robbert Wethmar <robbert@wethmar.nl>
Cc: Bart van der Klip <bklip@xs4all.nl>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/mcs7830.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index c3d119f997f5..ebf1332abaa1 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -46,6 +46,10 @@ | |||
46 | 46 | ||
47 | #define MCS7830_VENDOR_ID 0x9710 | 47 | #define MCS7830_VENDOR_ID 0x9710 |
48 | #define MCS7830_PRODUCT_ID 0x7830 | 48 | #define MCS7830_PRODUCT_ID 0x7830 |
49 | #define MCS7730_PRODUCT_ID 0x7730 | ||
50 | |||
51 | #define SITECOM_VENDOR_ID 0x0DF6 | ||
52 | #define LN_030_PRODUCT_ID 0x0021 | ||
49 | 53 | ||
50 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ | 54 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ |
51 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ | 55 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ |
@@ -491,7 +495,16 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | |||
491 | } | 495 | } |
492 | 496 | ||
493 | static const struct driver_info moschip_info = { | 497 | static const struct driver_info moschip_info = { |
494 | .description = "MOSCHIP 7830 usb-NET adapter", | 498 | .description = "MOSCHIP 7830/7730 usb-NET adapter", |
499 | .bind = mcs7830_bind, | ||
500 | .rx_fixup = mcs7830_rx_fixup, | ||
501 | .flags = FLAG_ETHER, | ||
502 | .in = 1, | ||
503 | .out = 2, | ||
504 | }; | ||
505 | |||
506 | static const struct driver_info sitecom_info = { | ||
507 | .description = "Sitecom LN-30 usb-NET adapter", | ||
495 | .bind = mcs7830_bind, | 508 | .bind = mcs7830_bind, |
496 | .rx_fixup = mcs7830_rx_fixup, | 509 | .rx_fixup = mcs7830_rx_fixup, |
497 | .flags = FLAG_ETHER, | 510 | .flags = FLAG_ETHER, |
@@ -504,6 +517,14 @@ static const struct usb_device_id products[] = { | |||
504 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), | 517 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), |
505 | .driver_info = (unsigned long) &moschip_info, | 518 | .driver_info = (unsigned long) &moschip_info, |
506 | }, | 519 | }, |
520 | { | ||
521 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID), | ||
522 | .driver_info = (unsigned long) &moschip_info, | ||
523 | }, | ||
524 | { | ||
525 | USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID), | ||
526 | .driver_info = (unsigned long) &sitecom_info, | ||
527 | }, | ||
507 | {}, | 528 | {}, |
508 | }; | 529 | }; |
509 | MODULE_DEVICE_TABLE(usb, products); | 530 | MODULE_DEVICE_TABLE(usb, products); |