summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2009-01-03 10:11:56 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2009-01-03 10:11:56 +0000
commit3d88dbc023de64645a976daab73ad51d633bf807 (patch)
tree24d1409d2c01df17b9bd1701f2ae99469a6ef702
parent33521ba9522b1bcc4b79f3a3f22a17bdd9f4a1dd (diff)
remove check for rfkill switch state using GP_CNTRL as it does not
seem to work properly. it is checked later in wpi_post_alive() anyway. pointed out by many, further investigated by Tim van der Molen.
-rw-r--r--sys/dev/pci/if_wpi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 1af5776d5b6..5e0f5ad7963 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.80 2008/12/22 18:20:47 damien Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.81 2009/01/03 10:11:55 damien Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -3305,6 +3305,7 @@ wpi_init(struct ifnet *ifp)
struct ieee80211com *ic = &sc->sc_ic;
int error;
+#ifdef notyet
/* Check that the radio is not disabled by hardware switch. */
if (!(WPI_READ(sc, WPI_GP_CNTRL) & WPI_GP_CNTRL_RFKILL)) {
printf("%s: radio is disabled by hardware switch\n",
@@ -3312,7 +3313,7 @@ wpi_init(struct ifnet *ifp)
error = EPERM; /* :-) */
goto fail;
}
-
+#endif
/* Read firmware images from the filesystem. */
if ((error = wpi_read_firmware(sc)) != 0) {
printf("%s: could not read firmware\n", sc->sc_dev.dv_xname);