svn commit: r232041 - head/sys/dev/ath

[Adrian Chadd]

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.