diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2008-02-17 05:29:26 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2008-02-17 05:29:26 +0000 |
commit | c23dc2b24788b8e11780e647929c6c7e810a44f1 (patch) | |
tree | 3da57c2f85cbba9d88ff23d603cb0a8da1769e36 /sys/dev/pci/if_re_pci.c | |
parent | e617ae70c4c2e2f0280137181983a957a86a9652 (diff) |
Simplify the hw revision handling by removing the use of the
rl_type softc field and only relying on the sc_hwrev softc
field thoughout the driver.
Tested by a number of users from tech@
ok dlg@
Diffstat (limited to 'sys/dev/pci/if_re_pci.c')
-rw-r--r-- | sys/dev/pci/if_re_pci.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index 9d7d71e3d22..9657383eab2 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_pci.c,v 1.19 2006/11/28 20:04:02 brad Exp $ */ +/* $OpenBSD: if_re_pci.c,v 1.20 2008/02/17 05:29:25 brad Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -186,18 +186,8 @@ re_pci_attach(struct device *parent, struct device *self, void *aux) } sc->sc_dmat = pa->pa_dmat; - sc->sc_flags |= RL_ENABLED; - if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_REALTEK) { - if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_REALTEK_RT8139) - sc->rl_type = RL_8139CPLUS; - else - sc->rl_type = RL_8169; - } else if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_TTTECH && - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_TTTECH_MC322) - sc->rl_type = RL_8139CPLUS; - else - sc->rl_type = RL_8169; + sc->sc_flags |= RL_ENABLED; /* Call bus-independent attach routine */ re_attach(sc, intrstr); |