diff options
author | Malte Doersam <mdoersam@arcor.de> | 2006-01-28 11:48:33 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 17:49:56 -0500 |
commit | efafe6fb72b2bbab40080a08f7946f1eadb9bad9 (patch) | |
tree | 502053738219df278ecc7b0175d7fee4d8ec611c /drivers/usb/net/pegasus.c | |
parent | aef4e266964bc15861b5835c1f5b9d2ebc155c2a (diff) |
[PATCH] USB: Pegasus: Linksys USBVPN1 support + cleanup
This patch adds a second linksys vendor-id (077b) and the product id of the
pegasus based adapter USBVPN1
http://www1.linksys.com/Products/product.asp?prid=3D543&scid=3D30
Furthermore it replaces all LINKSYS_GPIO_RESET with DEFAULT_GPIO_RESET as both
are declared like this:
#define DEFAULT_GPIO_RESET 0x24
#define LINKSYS_GPIO_RESET 0x24
This is misleading and confusing.
The check is now done via the VENDOR_ID in pegasus.c:
if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS
Signed-off-by: Malte Doersam <mdoersam@arcor.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/net/pegasus.c')
-rw-r--r-- | drivers/usb/net/pegasus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index 156a2f1cb39a..5b6675684567 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
@@ -524,6 +524,7 @@ static int enable_net_traffic(struct net_device *dev, struct usb_device *usb) | |||
524 | ret = set_registers(pegasus, EthCtrl0, 3, data); | 524 | ret = set_registers(pegasus, EthCtrl0, 3, data); |
525 | 525 | ||
526 | if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS || | 526 | if (usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS || |
527 | usb_dev_id[pegasus->dev_index].vendor == VENDOR_LINKSYS2 || | ||
527 | usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) { | 528 | usb_dev_id[pegasus->dev_index].vendor == VENDOR_DLINK) { |
528 | u16 auxmode; | 529 | u16 auxmode; |
529 | read_mii_word(pegasus, 0, 0x1b, &auxmode); | 530 | read_mii_word(pegasus, 0, 0x1b, &auxmode); |