From owner-svn-src-user@FreeBSD.ORG  Thu Oct 20 07:24:34 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5EA2B106566C;
	Thu, 20 Oct 2011 07:24:34 +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 4DFC38FC15;
	Thu, 20 Oct 2011 07:24:34 +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 p9K7OYFF062458;
	Thu, 20 Oct 2011 07:24:34 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9K7OYmI062456;
	Thu, 20 Oct 2011 07:24:34 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201110200724.p9K7OYmI062456@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 20 Oct 2011 07:24:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226558 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Oct 2011 07:24:34 -0000

Author: adrian
Date: Thu Oct 20 07:24:33 2011
New Revision: 226558
URL: http://svn.freebsd.org/changeset/base/226558

Log:
  Re-add this locking for now, just so I don't have to undo the locking
  I've added around ath_reset() and ath_reset_locked().
  
  This fixes the panic I was seeing in ath_startrecv().

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Thu Oct 20 06:55:59 2011	(r226557)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Thu Oct 20 07:24:33 2011	(r226558)
@@ -5011,6 +5011,7 @@ ath_chan_change(struct ath_softc *sc, st
 {
 	enum ieee80211_phymode mode;
 
+	ATH_LOCK(sc);
 	/*
 	 * Change channels and update the h/w rate map
 	 * if we're switching; e.g. 11a to 11b/g.
@@ -5019,6 +5020,7 @@ ath_chan_change(struct ath_softc *sc, st
 	if (mode != sc->sc_curmode)
 		ath_setcurmode(sc, mode);
 	sc->sc_curchan = chan;
+	ATH_UNLOCK(sc);
 }
 
 /*