Author: adrian
Date: Tue Jan 6 18:25:10 2015
New Revision: 276757
URL: https://svnweb.freebsd.org/changeset/base/276757
Log:
Global-ify channel_type() - this fixes non-debug net80211 builds.
Modified:
head/sys/net80211/ieee80211.c
head/sys/net80211/ieee80211_scan.c
head/sys/net80211/ieee80211_scan_sw.c
head/sys/net80211/ieee80211_var.h
Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c Tue Jan 6 16:47:02 2015
(r276756)
+++ head/sys/net80211/ieee80211.c Tue Jan 6 18:25:10 2015
(r276757)
@@ -1747,3 +1747,23 @@ ieee80211_mac_hash(const struct ieee8021
return c;
}
#undef mix
+
+char
+ieee80211_channel_type_char(const struct ieee80211_channel *c)
+{
+ if (IEEE80211_IS_CHAN_ST(c))
+ return 'S';
+ if (IEEE80211_IS_CHAN_108A(c))
+ return 'T';
+ if (IEEE80211_IS_CHAN_108G(c))
+ return 'G';
+ if (IEEE80211_IS_CHAN_HT(c))
+ return 'n';
+ if (IEEE80211_IS_CHAN_A(c))
+ return 'a';
+ if (IEEE80211_IS_CHAN_ANYG(c))
+ return 'g';
+ if (IEEE80211_IS_CHAN_B(c))
+ return 'b';
+ return 'f';
+}
Modified: head/sys/net80211/ieee80211_scan.c
==============================================================================
--- head/sys/net80211/ieee80211_scan.c Tue Jan 6 16:47:02 2015
(r276756)
+++ head/sys/net80211/ieee80211_scan.c Tue Jan 6 18:25:10 2015
(r276757)
@@ -260,29 +260,6 @@ ieee80211_scan_update_locked(struct ieee
}
}
-/*
- * XXX TODO: should be a global method!
- */
-static char
-channel_type(const struct ieee80211_channel *c)
-{
- if (IEEE80211_IS_CHAN_ST(c))
- return 'S';
- if (IEEE80211_IS_CHAN_108A(c))
- return 'T';
- if (IEEE80211_IS_CHAN_108G(c))
- return 'G';
- if (IEEE80211_IS_CHAN_HT(c))
- return 'n';
- if (IEEE80211_IS_CHAN_A(c))
- return 'a';
- if (IEEE80211_IS_CHAN_ANYG(c))
- return 'g';
- if (IEEE80211_IS_CHAN_B(c))
- return 'b';
- return 'f';
-}
-
void
ieee80211_scan_dump_channels(const struct ieee80211_scan_state *ss)
{
@@ -295,7 +272,7 @@ ieee80211_scan_dump_channels(const struc
const struct ieee80211_channel *c = ss->ss_chans[i];
printf("%s%u%c", sep, ieee80211_chan2ieee(ic, c),
- channel_type(c));
+ ieee80211_channel_type_char(c));
sep = ", ";
}
}
Modified: head/sys/net80211/ieee80211_scan_sw.c
==============================================================================
--- head/sys/net80211/ieee80211_scan_sw.c Tue Jan 6 16:47:02 2015
(r276756)
+++ head/sys/net80211/ieee80211_scan_sw.c Tue Jan 6 18:25:10 2015
(r276757)
@@ -185,27 +185,6 @@ ieee80211_swscan_vdetach(struct ieee8021
}
}
-/* XXX should be a global net80211 function */
-static char
-channel_type(const struct ieee80211_channel *c)
-{
- if (IEEE80211_IS_CHAN_ST(c))
- return 'S';
- if (IEEE80211_IS_CHAN_108A(c))
- return 'T';
- if (IEEE80211_IS_CHAN_108G(c))
- return 'G';
- if (IEEE80211_IS_CHAN_HT(c))
- return 'n';
- if (IEEE80211_IS_CHAN_A(c))
- return 'a';
- if (IEEE80211_IS_CHAN_ANYG(c))
- return 'g';
- if (IEEE80211_IS_CHAN_B(c))
- return 'b';
- return 'f';
-}
-
void
ieee80211_swscan_set_scan_duration(struct ieee80211vap *vap, u_int duration)
{
@@ -667,8 +646,9 @@ scan_task(void *arg, int pending)
"%s: chan %3d%c -> %3d%c [%s, dwell min %lums max %lums]\n",
__func__,
ieee80211_chan2ieee(ic, ic->ic_curchan),
- channel_type(ic->ic_curchan),
- ieee80211_chan2ieee(ic, chan), channel_type(chan),
+ ieee80211_channel_type_char(ic->ic_curchan),
+ ieee80211_chan2ieee(ic, chan),
+ ieee80211_channel_type_char(chan),
(ss->ss_flags & IEEE80211_SCAN_ACTIVE) &&
(chan->ic_flags & IEEE80211_CHAN_PASSIVE) == 0 ?
"active" : "passive",
@@ -878,7 +858,7 @@ ieee80211_swscan_add_scan(struct ieee802
"%s: chan %3d%c min dwell met (%u > %lu)\n",
__func__,
ieee80211_chan2ieee(ic, ic->ic_curchan),
- channel_type(ic->ic_curchan),
+ ieee80211_channel_type_char(ic->ic_curchan),
ticks, SCAN_PRIVATE(ss)->ss_chanmindwell);
SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_MINDWELL;
/*
Modified: head/sys/net80211/ieee80211_var.h
==============================================================================
--- head/sys/net80211/ieee80211_var.h Tue Jan 6 16:47:02 2015
(r276756)
+++ head/sys/net80211/ieee80211_var.h Tue Jan 6 18:25:10 2015
(r276757)
@@ -711,6 +711,7 @@ int ieee80211_setmode(struct ieee80211co
enum ieee80211_phymode ieee80211_chan2mode(const struct ieee80211_channel *);
uint32_t ieee80211_mac_hash(const struct ieee80211com *,
const uint8_t addr[IEEE80211_ADDR_LEN]);
+char ieee80211_channel_type_char(const struct ieee80211_channel *c);
void ieee80211_radiotap_attach(struct ieee80211com *,
struct ieee80211_radiotap_header *th, int tlen,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
