diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-05-09 16:41:15 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2007-05-09 16:41:15 +0000 |
| commit | af33119781efeaf92c0c8ad3db0f2a37b98d6621 (patch) | |
| tree | a926e61fca71d79bb6f1e8f87276b1abf26d4be6 /sys/dev | |
| parent | 0da53f0448bb68f4f90c949ab0c4db93c4256328 (diff) | |
remove the internal wrapper functions for ieee80211_mhz2ieee and
ieee80211_ieee2mhz which also removes some dead code.
figured out by deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/ar5xxx.c | 16 | ||||
| -rw-r--r-- | sys/dev/ic/ar5xxx.h | 5 | ||||
| -rw-r--r-- | sys/dev/ic/ath.c | 4 |
3 files changed, 5 insertions, 20 deletions
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c index 89cffa45279..4ba700d3f7c 100644 --- a/sys/dev/ic/ar5xxx.c +++ b/sys/dev/ic/ar5xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5xxx.c,v 1.40 2007/04/13 14:44:41 reyk Exp $ */ +/* $OpenBSD: ar5xxx.c,v 1.41 2007/05/09 16:41:14 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -369,18 +369,6 @@ ath_hal_computetxtime(struct ath_hal *hal, const HAL_RATE_TABLE *rates, return (value); } -u_int -ath_hal_mhz2ieee(u_int mhz, u_int flags) -{ - return (ieee80211_mhz2ieee(mhz, flags)); -} - -u_int -ath_hal_ieee2mhz(u_int ieee, u_int flags) -{ - return (ieee80211_ieee2mhz(ieee, flags)); -} - HAL_BOOL ar5k_check_channel(struct ath_hal *hal, u_int16_t freq, u_int flags) { @@ -1224,7 +1212,7 @@ ar5k_ar5111_channel(struct ath_hal *hal, HAL_CHANNEL *channel) * Set the channel on the AR5111 radio */ data0 = data1 = 0; - ath_channel = ieee_channel = ath_hal_mhz2ieee(channel->c_channel, + ath_channel = ieee_channel = ieee80211_mhz2ieee(channel->c_channel, channel->c_channel_flags); if (channel->c_channel_flags & IEEE80211_CHAN_2GHZ) { diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h index eca6daac97f..e48df91075e 100644 --- a/sys/dev/ic/ar5xxx.h +++ b/sys/dev/ic/ar5xxx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5xxx.h,v 1.40 2007/04/13 14:44:41 reyk Exp $ */ +/* $OpenBSD: ar5xxx.h,v 1.41 2007/05/09 16:41:14 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -1942,9 +1942,6 @@ struct ath_hal *ath_hal_attach(u_int16_t, void *, bus_space_tag_t, u_int16_t ath_hal_computetxtime(struct ath_hal *, const HAL_RATE_TABLE *, u_int32_t, u_int16_t, HAL_BOOL); -u_int ath_hal_mhz2ieee(u_int, u_int); -u_int ath_hal_ieee2mhz(u_int, u_int); - HAL_BOOL ath_hal_init_channels(struct ath_hal *, HAL_CHANNEL *, u_int, u_int *, u_int16_t, HAL_BOOL, HAL_BOOL); diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 13afb34b201..07cfd9759d7 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.62 2007/04/13 14:44:41 reyk Exp $ */ +/* $OpenBSD: ath.c,v 1.63 2007/05/09 16:41:14 reyk Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -3057,7 +3057,7 @@ ath_getchannels(struct ath_softc *sc, HAL_BOOL outdoor, HAL_BOOL xchanmode) */ for (i = 0; i < nchan; i++) { HAL_CHANNEL *c = &chans[i]; - ix = ath_hal_mhz2ieee(c->channel, c->channelFlags); + ix = ieee80211_mhz2ieee(c->channel, c->channelFlags); if (ix > IEEE80211_CHAN_MAX) { printf("%s: bad hal channel %u (%u/%x) ignored\n", ifp->if_xname, ix, c->channel, c->channelFlags); |