summaryrefslogtreecommitdiffstats
path: root/sys/net80211
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2005-12-12 18:42:20 +0000
committersam <sam@FreeBSD.org>2005-12-12 18:42:20 +0000
commit14e234a70b64d2ac7420ba343f4586e3bf82d9a8 (patch)
tree2d196bea56a3fd54658420b787d1d71beaeab05c /sys/net80211
parent85817ec3681b80bb53262e834ecd34682be232fe (diff)
downloadFreeBSD-src-14e234a70b64d2ac7420ba343f4586e3bf82d9a8.zip
FreeBSD-src-14e234a70b64d2ac7420ba343f4586e3bf82d9a8.tar.gz
Bandaid ieee80211_set_chan to handle a channel parameter of "any";
this can happen under certain conditions when scanning. This logic will eventually go away with the new scanning code. While here de-inline the routine. MFC after: 1 week
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_node.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 567c499..8efc33e 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -217,10 +217,12 @@ ieee80211_node_unauthorize(struct ieee80211_node *ni)
* Set/change the channel. The rate set is also updated as
* to insure a consistent view by drivers.
*/
-static __inline void
+static void
ieee80211_set_chan(struct ieee80211com *ic,
struct ieee80211_node *ni, struct ieee80211_channel *chan)
{
+ if (chan == IEEE80211_CHAN_ANYC) /* XXX while scanning */
+ chan = ic->ic_curchan;
ni->ni_chan = chan;
ni->ni_rates = ic->ic_sup_rates[ieee80211_chan2mode(ic, chan)];
}
OpenPOWER on IntegriCloud