Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 223639
b: refs/heads/master
c: bbccc16
h: refs/heads/master
i:
  223637: 93c9b56
  223635: 58bafee
  223631: f81d59f
v: v3
  • Loading branch information
Andreas Mohr authored and David S. Miller committed Dec 20, 2010
1 parent 191f1d8 commit 35d05de
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 173021072e86a0a5b3d2271347493a3e0d5f68e8
refs/heads/master: bbccc16c8a27d75dabe88326f7074181493a3b69
12 changes: 10 additions & 2 deletions trunk/drivers/net/usb/mcs7830.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* MOSCHIP MCS7830 based USB 2.0 Ethernet Devices
* MOSCHIP MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices
*
* based on usbnet.c, asix.c and the vendor provided mcs7830 driver
*
Expand All @@ -11,6 +11,9 @@
*
* Definitions gathered from MOSCHIP, Data Sheet_7830DA.pdf (thanks!).
*
* 2010-12-19: add 7832 USB PID ("functionality same as MCS7830"),
* per active notification by manufacturer
*
* TODO:
* - support HIF_REG_CONFIG_SLEEPMODE/HIF_REG_CONFIG_TXENABLE (via autopm?)
* - implement ethtool_ops get_pauseparam/set_pauseparam
Expand Down Expand Up @@ -60,6 +63,7 @@
#define MCS7830_MAX_MCAST 64

#define MCS7830_VENDOR_ID 0x9710
#define MCS7832_PRODUCT_ID 0x7832
#define MCS7830_PRODUCT_ID 0x7830
#define MCS7730_PRODUCT_ID 0x7730

Expand Down Expand Up @@ -626,7 +630,7 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
}

static const struct driver_info moschip_info = {
.description = "MOSCHIP 7830/7730 usb-NET adapter",
.description = "MOSCHIP 7830/7832/7730 usb-NET adapter",
.bind = mcs7830_bind,
.rx_fixup = mcs7830_rx_fixup,
.flags = FLAG_ETHER,
Expand All @@ -644,6 +648,10 @@ static const struct driver_info sitecom_info = {
};

static const struct usb_device_id products[] = {
{
USB_DEVICE(MCS7830_VENDOR_ID, MCS7832_PRODUCT_ID),
.driver_info = (unsigned long) &moschip_info,
},
{
USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID),
.driver_info = (unsigned long) &moschip_info,
Expand Down

0 comments on commit 35d05de

Please sign in to comment.