Date: Mon, 22 Jan 2007 19:08:50 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 113376 for review Message-ID: <200701221908.l0MJ8ol0074458@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=113376 Change 113376 by sam@sam_ebb on 2007/01/22 19:08:39 remove hack mapping of psb channel #'s; we're ready to use the real thing Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#129 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#129 (text+ko) ==== @@ -5453,11 +5453,6 @@ ath_getchannels(struct ath_softc *sc, HAL_REG_DOMAIN rd, HAL_CTRY_CODE cc, HAL_BOOL outdoor, HAL_BOOL xchanmode) { -#define COMPAT \ - (CHANNEL_ALL_NOTURBO|CHANNEL_PASSIVE|CHANNEL_HALF|CHANNEL_QUARTER) -#define IS_CHAN_PUBLIC_SAFETY(_c) \ - (((_c)->channelFlags & CHANNEL_5GHZ) && \ - ((_c)->channel > 4940 && (_c)->channel < 4990)) struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; @@ -5488,9 +5483,11 @@ HAL_CHANNEL *c = &chans[i]; struct ieee80211_channel *ichan = &ic->ic_channels[i]; - ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel, c->channelFlags); - if (IS_CHAN_PUBLIC_SAFETY(c)) - ichan->ic_ieee += 37; /* XXX */ + ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel, + c->channelFlags); + if (bootverbose) + if_printf(ifp, "hal channel %u/%x -> %u\n", + c->channel, c->channelFlags, ichan->ic_ieee); ichan->ic_freq = c->channel; ichan->ic_flags = c->channelFlags; if (ath_hal_isgsmsku(ah)) { @@ -5498,7 +5495,7 @@ ichan->ic_freq = 922 + (2422 - ichan->ic_freq); ichan->ic_flags |= IEEE80211_CHAN_GSM; ichan->ic_ieee = ieee80211_mhz2ieee(ichan->ic_freq, - ichan->ic_flags); + ichan->ic_flags); } ichan->ic_maxregpower = c->maxRegTxPower; /* dBm */ ichan->ic_maxpower = c->maxTxPower / 2; /* 1/2 dBm */ @@ -5511,8 +5508,6 @@ sc->sc_xchanmode = xchanmode; sc->sc_outdoor = outdoor; return 0; -#undef IS_CHAN_PUBLIC_SAFETY -#undef COMPAT } static void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701221908.l0MJ8ol0074458>