From owner-p4-projects@FreeBSD.ORG  Fri Oct  3 04:33:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 48A9F106568D; Fri,  3 Oct 2008 04:33:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D03C1065688
	for <perforce@freebsd.org>; Fri,  3 Oct 2008 04:33:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC9E8FC1E
	for <perforce@freebsd.org>; Fri,  3 Oct 2008 04:33:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m934X2el029025
	for <perforce@freebsd.org>; Fri, 3 Oct 2008 04:33:02 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m934X2lQ029023
	for perforce@freebsd.org; Fri, 3 Oct 2008 04:33:02 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 3 Oct 2008 04:33:02 GMT
Message-Id: <200810030433.m934X2lQ029023@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 150831 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Oct 2008 04:33:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=150831

Change 150831 by sam@sam_ebb on 2008/10/03 04:32:22

	IFC

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 integrate

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#25 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.10 2008/04/20 20:35:44 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.11 2008/09/27 21:18:40 sam Exp $");
 
 /*
  * IEEE 802.11 station scanning support.
@@ -1392,9 +1392,12 @@
 			 */
 			if (vap->iv_des_chan == IEEE80211_CHAN_ANYC ||
 			    IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
-				chan = ieee80211_ht_adjust_channel(vap->iv_ic,
-				    adhoc_pick_channel(ss, 0),
-				    vap->iv_flags_ext);
+				struct ieee80211com *ic = vap->iv_ic;
+
+				chan = adhoc_pick_channel(ss, 0);
+				if (chan != NULL)
+					chan = ieee80211_ht_adjust_channel(ic,
+					    chan, vap->iv_flags_ext);
 			} else
 				chan = vap->iv_des_chan;
 			if (chan != NULL) {