svn commit: r188428 - projects/vap7/sys/net80211

[Sam Leffler]

Author: sam
Date: Tue Feb 10 01:39:55 2009
New Revision: 188428
URL: http://svn.freebsd.org/changeset/base/188428

Log:
  merge 188427: correctly fixup iv_des_chan after installing a new channel table

Modified:
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_regdomain.c

Modified: projects/vap7/sys/net80211/ieee80211_regdomain.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_regdomain.c	Tue Feb 10 01:37:55 2009	(r188427)
+++ projects/vap7/sys/net80211/ieee80211_regdomain.c	Tue Feb 10 01:39:55 2009	(r188428)
@@ -428,8 +428,9 @@ ieee80211_setregdomain(struct ieee80211v
 	ieee80211_scan_flush(vap);
 	ieee80211_dfs_reset(ic);
 	if (vap->iv_des_chan != IEEE80211_CHAN_ANYC) {
+		c = ieee80211_find_channel(ic, desfreq, desflags);
 		/* NB: may be NULL if not present in new channel list */
-		vap->iv_des_chan = ieee80211_find_channel(ic, desfreq, desflags);
+		vap->iv_des_chan = (c != NULL) ? c : IEEE80211_CHAN_ANYC;
 	}
 	IEEE80211_UNLOCK(ic);