From owner-svn-src-head@FreeBSD.ORG  Thu Feb 23 08:32:54 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF8F8106566B;
	Thu, 23 Feb 2012 08:32:54 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA6A28FC08;
	Thu, 23 Feb 2012 08:32:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1N8Ws7P091886;
	Thu, 23 Feb 2012 08:32:54 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1N8WsxW091884;
	Thu, 23 Feb 2012 08:32:54 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201202230832.q1N8WsxW091884@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 23 Feb 2012 08:32:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232041 - head/sys/dev/ath
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Feb 2012 08:32:55 -0000

Author: adrian
Date: Thu Feb 23 08:32:54 2012
New Revision: 232041
URL: http://svn.freebsd.org/changeset/base/232041

Log:
  Use the passed-in channel rather than ic->ic_curchan.
  
  I'm not sure _why_ the ic is NULL here, but I've seen it occasionally do
  this after I've been tinkering with things for a while.  It ends up
  crashing in a call to ath_chan_set() via the net80211 scan code and scan
  task.

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Feb 23 08:22:44 2012	(r232040)
+++ head/sys/dev/ath/if_ath.c	Thu Feb 23 08:32:54 2012	(r232041)
@@ -5432,7 +5432,7 @@ ath_chan_set(struct ath_softc *sc, struc
 		sc->sc_diversity = ath_hal_getdiversity(ah);
 
 		/* Let DFS at it in case it's a DFS channel */
-		ath_dfs_radar_enable(sc, ic->ic_curchan);
+		ath_dfs_radar_enable(sc, chan);
 
 		/*
 		 * Re-enable rx framework.