From 5ad6ade5e85987b54b0e14483b27ed413a39ff2d Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Fri, 13 Apr 2007 14:44:42 +0000 Subject: 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 --- sys/dev/ic/athvar.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sys/dev/ic/athvar.h') diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index 75fbb2fae81..dade9abc274 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athvar.h,v 1.18 2006/06/23 21:53:01 reyk Exp $ */ +/* $OpenBSD: athvar.h,v 1.19 2007/04/13 14:44:41 reyk Exp $ */ /* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */ /*- @@ -231,7 +231,8 @@ struct ath_softc { sc_doani : 1, /* dynamic noise immunity */ sc_veol : 1, /* tx VEOL support */ sc_softled : 1, /* GPIO software LED */ - sc_probing : 1; /* probing AP on beacon miss */ + sc_probing : 1, /* probing AP on beacon miss */ + sc_64bit : 1; /* indicates PCI Express */ u_int sc_nchan; /* number of valid channels */ const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_currates; /* current rate table */ -- cgit v1.2.3