diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2006-08-15 16:48:08 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2006-08-15 16:48:08 +0000 |
| commit | 9bcce469d58917ee855ce0834f9d1cd37eab03a9 (patch) | |
| tree | 633a92b9a81aefde56f2a3c6bce35a89cb19a787 /sys | |
| parent | f337a11384f46920d34fdebe9d54d4e369a28847 (diff) | |
Remove obsolete macros.
Pointed out by deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/acx.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 7d2ce719f9e..882e42e38f7 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.44 2006/08/15 15:43:34 deraadt Exp $ */ +/* $OpenBSD: acx.c,v 1.45 2006/08/15 16:48:07 mglocker Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -136,22 +136,6 @@ int acxdebug = 0; #endif -#define ACX_ENABLE_TXCHAN(sc, chan, ifname) \ -do { \ - if (acx_enable_txchan((sc), (chan)) != 0) { \ - DPRINTF(("%s: enable TX on channel %d failed\n", \ - (ifname), (chan))); \ - } \ -} while (0) - -#define ACX_ENABLE_RXCHAN(sc, chan, ifname) \ -do { \ - if (acx_enable_rxchan((sc), (chan)) != 0) { \ - DPRINTF(("%s: enable RX on channel %d failed\n", \ - (ifname), (chan))); \ - } \ -} while (0) - int acx_attach(struct acx_softc *); int acx_detach(void *); void acx_shutdown(void *); @@ -1844,8 +1828,15 @@ acx_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg) uint8_t chan; chan = ieee80211_chan2ieee(ic, ic->ic_bss->ni_chan); - ACX_ENABLE_TXCHAN(sc, chan, ifp->if_xname); - ACX_ENABLE_RXCHAN(sc, chan, ifp->if_xname); + + if (acx_enable_txchan(sc, chan) != 0) { + DPRINTF(("%s: enable TX on channel %d failed\n", + ifp->if_xname, chan)); + } + if (acx_enable_rxchan(sc, chan) != 0) { + DPRINTF(("%s: enable RX on channel %d failed\n", + ifp->if_xname, chan)); + } timeout_add(&sc->sc_chanscan_timer, hz / acx_chanscan_rate); |