diff options
| author |   reyk <reyk@openbsd.org> | 2007-04-13 14:44:41 +0000 |
|---|---|---|
| committer | reyk <reyk@openbsd.org> | 2007-04-13 14:44:41 +0000 |
| commit | 9cfa9686cd3fb369180a11e544d674c56dcdcf6c (patch) | |
| tree | db3ca2c28fd5e06ce0aa5db704846b425ac67a04 /sys/dev/ic/ath.c | |
| parent | allow multiple -t to increase the test count. cpus are getting too fast. (diff) | |
| download | wireguard-openbsd-9cfa9686cd3fb369180a11e544d674c56dcdcf6c.tar.xz wireguard-openbsd-9cfa9686cd3fb369180a11e544d674c56dcdcf6c.zip | |
The integrated Atheros NICs found in IBM/Lenovo ThinkPads use the same
device ID for old AR5212-based 32bit and new AR5424-based 64bit (PCI
Express Mini Card) interfaces. Use an extra check to look if the card
is 64bit and attach it as a single chip device. This prevents a panic
when attaching the device on some laptops like the T60.
Tested on a T42 (old AR5212 Mini PCI interface),
Tested on a T60 (new AR5424 Mini Card interface)
Nevertheless, the AR5424 does not work yet.
Thanks to Stefan Konrath
Diffstat (limited to 'sys/dev/ic/ath.c')
| -rw-r--r-- | sys/dev/ic/ath.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index a99e5cf017f..13afb34b201 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.61 2007/01/03 18:16:43 claudio Exp $ */ +/* $OpenBSD: ath.c,v 1.62 2007/04/13 14:44:41 reyk Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -221,7 +221,8 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) bcopy(sc->sc_dev.dv_xname, ifp->if_xname, IFNAMSIZ); sc->sc_flags &= ~ATH_ATTACHED; /* make sure that it's not attached */ - ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, &status); + ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, sc->sc_64bit, + &status); if (ah == NULL) { printf("%s: unable to attach hardware; HAL status %d\n", ifp->if_xname, status); |