From 14e234a70b64d2ac7420ba343f4586e3bf82d9a8 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 12 Dec 2005 18:42:20 +0000 Subject: 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 --- sys/net80211/ieee80211_node.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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)]; } -- cgit v1.1