summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-11-21 23:00:17 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-11-21 23:00:17 +0000
commitf7b4d23e16ce2b17dc826ca881546df41248c8b0 (patch)
tree0d07983e34e9fbf2e77845efb0a4eb2a372e098e /sys/dev
parent29efd5d39ae2198bec8ffc44fa81e1d68a88037f (diff)
Fail wi_get_txpower() on USB wi(4), so that we don't CSR_READ on them.
ok mickey@ jsg@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/if_wi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index fb4828169bf..9f69c04ca7d 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.135 2006/11/06 10:49:01 jsg Exp $ */
+/* $OpenBSD: if_wi.c,v 1.136 2006/11/21 23:00:16 miod Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -127,7 +127,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.135 2006/11/06 10:49:01 jsg Exp $";
+ "$OpenBSD: if_wi.c,v 1.136 2006/11/21 23:00:16 miod Exp $";
#endif /* lint */
#ifdef foo
@@ -3179,6 +3179,9 @@ wi_get_txpower(struct wi_softc *sc, struct ieee80211_txpower *txpower)
int8_t tmp;
int error;
+ if (sc->wi_flags & WI_FLAGS_BUS_USB)
+ return (EOPNOTSUPP);
+
/* Get manual TX power */
cmd = WI_CMD_READ_MIF;
if ((error = wi_cmd(sc, cmd,