From owner-svn-src-projects@FreeBSD.ORG  Tue Feb 10 01:39:56 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13CF8106564A;
	Tue, 10 Feb 2009 01:39:56 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 02D328FC17;
	Tue, 10 Feb 2009 01:39:56 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1A1dtGJ077134;
	Tue, 10 Feb 2009 01:39:55 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1A1dtUo077133;
	Tue, 10 Feb 2009 01:39:55 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902100139.n1A1dtUo077133@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 10 Feb 2009 01:39:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188428 - projects/vap7/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2009 01:39:56 -0000

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);