diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2013-01-16 06:15:59 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2013-01-16 06:15:59 +0000 |
| commit | 670b2c65309e277c2ed197a304470cf8502fbfba (patch) | |
| tree | e72e9e4f72e528b569862dfd8de245ddd0b6dd66 /sys/dev | |
| parent | bd0650c975681eda7b3403ce99aff2e5e65b5e66 (diff) | |
Some corrections for D-Link device names.
ok jsing@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_rl_pci.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_ste.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index 888c8116bd3..0b6e067cdca 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.22 2013/01/16 04:42:44 brad Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.23 2013/01/16 06:15:58 brad Exp $ */ /* * Copyright (c) 1997, 1998 @@ -104,7 +104,7 @@ const struct pci_matchid rl_pci_devices[] = { { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_2CB_TXD }, { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CB_TXD }, { PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_8139 }, - { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_530TXPLUS }, + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE530TXPLUS }, { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE690TXD }, { PCI_VENDOR_NORTEL, PCI_PRODUCT_NORTEL_BS21 }, { PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3603_TX }, diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index a97628702f3..3315e99b298 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.50 2012/11/29 21:10:32 brad Exp $ */ +/* $OpenBSD: if_ste.c,v 1.51 2013/01/16 06:15:58 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -821,9 +821,9 @@ ste_stats_update(void *xsc) } const struct pci_matchid ste_devices[] = { + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE550TX }, { PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST201_1 }, - { PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST201_2 }, - { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_550TX } + { PCI_VENDOR_SUNDANCE, PCI_PRODUCT_SUNDANCE_ST201_2 } }; /* @@ -856,11 +856,11 @@ ste_attach(struct device *parent, struct device *self, void *aux) /* * Only use one PHY since this chip reports multiple - * Note on the DFE-550 the PHY is at 1 on the DFE-580 + * Note on the DFE-550TX the PHY is at 1 on the DFE-580TX * it is at 0 & 1. It is rev 0x12. */ if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_DLINK && - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_DLINK_550TX && + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_DLINK_DFE550TX && PCI_REVISION(pa->pa_class) == 0x12) sc->ste_one_phy = 1; diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index bb3ad1415ef..d4d2776d1a8 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.1665 2013/01/16 03:33:14 brad Exp $ +$OpenBSD: pcidevs,v 1.1666 2013/01/16 06:15:58 brad Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -2058,8 +2058,8 @@ product DELTA 8139 0x1360 8139 product DIAMOND VIPER 0x9001 Viper/PCI /* D-Link products */ -product DLINK 550TX 0x1002 550TX -product DLINK 530TXPLUS 0x1300 530TX+ +product DLINK DFE550TX 0x1002 DFE-550TX +product DLINK DFE530TXPLUS 0x1300 DFE-530TX+ product DLINK DFE690TXD 0x1340 DFE-690TXD product DLINK DRP32TXD 0x1561 DRP32TXD product DLINK DWL610 0x3300 DWL-610 |