Date: Thu, 19 Feb 2009 04:44:18 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r188778 - head/sys/net80211 Message-ID: <200902190444.n1J4iIBd084467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Thu Feb 19 04:44:18 2009 New Revision: 188778 URL: http://svn.freebsd.org/changeset/base/188778 Log: Change country ie construction to simplify forthcoming changes: o use c99 initializer for skipflags o calculate band flags instead of statically listing them in the table Modified: head/sys/net80211/ieee80211_regdomain.c Modified: head/sys/net80211/ieee80211_regdomain.c ============================================================================== --- head/sys/net80211/ieee80211_regdomain.c Thu Feb 19 04:40:47 2009 (r188777) +++ head/sys/net80211/ieee80211_regdomain.c Thu Feb 19 04:44:18 2009 (r188778) @@ -216,17 +216,19 @@ ieee80211_alloc_countryie(struct ieee802 /* XXX what about auto? */ /* flag set of channels to be excluded */ static const int skipflags[IEEE80211_MODE_MAX] = { - CHAN_UNINTERESTING, /* MODE_AUTO */ - CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ, /* MODE_11A */ - CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ, /* MODE_11B */ - CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ, /* MODE_11G */ - CHAN_UNINTERESTING | IEEE80211_CHAN_OFDM | /* MODE_FH */ - IEEE80211_CHAN_CCK | IEEE80211_CHAN_DYN, - CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ, /* MODE_TURBO_A */ - CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ, /* MODE_TURBO_G */ - CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ, /* MODE_STURBO_A */ - CHAN_UNINTERESTING | IEEE80211_CHAN_2GHZ, /* MODE_11NA */ - CHAN_UNINTERESTING | IEEE80211_CHAN_5GHZ, /* MODE_11NG */ + [IEEE80211_MODE_AUTO] = CHAN_UNINTERESTING, + [IEEE80211_MODE_11A] = CHAN_UNINTERESTING, + [IEEE80211_MODE_11B] = CHAN_UNINTERESTING, + [IEEE80211_MODE_11G] = CHAN_UNINTERESTING, + [IEEE80211_MODE_FH] = CHAN_UNINTERESTING + | IEEE80211_CHAN_OFDM + | IEEE80211_CHAN_CCK + | IEEE80211_CHAN_DYN, + [IEEE80211_MODE_TURBO_A] = CHAN_UNINTERESTING, + [IEEE80211_MODE_TURBO_G] = CHAN_UNINTERESTING, + [IEEE80211_MODE_STURBO_A] = CHAN_UNINTERESTING, + [IEEE80211_MODE_11NA] = CHAN_UNINTERESTING, + [IEEE80211_MODE_11NG] = CHAN_UNINTERESTING, }; const struct ieee80211_regdomain *rd = &ic->ic_regdomain; uint8_t nextchan, chans[IEEE80211_CHAN_BYTES], *frm; @@ -268,6 +270,10 @@ ieee80211_alloc_countryie(struct ieee802 nruns = 0; memset(chans, 0, sizeof(chans)); skip = skipflags[ieee80211_chan2mode(ic->ic_bsschan)]; + if (IEEE80211_IS_CHAN_5GHZ(ic->ic_bsschan)) + skip |= IEEE80211_CHAN_2GHZ; + else if (IEEE80211_IS_CHAN_2GHZ(ic->ic_bsschan)) + skip |= IEEE80211_CHAN_5GHZ; for (i = 0; i < ic->ic_nchans; i++) { const struct ieee80211_channel *c = &ic->ic_channels[i];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902190444.n1J4iIBd084467>