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

[Adrian Chadd]

Author: adrian
Date: Wed Nov 23 07:12:26 2011
New Revision: 227872
URL: http://svn.freebsd.org/changeset/base/227872

Log:
  Re-lock the ath lock after ath_reset() has been called.
  The calibrate callout is done with the sc lock held.
  
  This only showed up when using an older NIC (AR5212) whose
  radio/phy requires the rfgain adjustment.
  
  Pointy-hat-to:	adrian
  Sponsored by:	Hobnob, Inc.

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

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Wed Nov 23 05:34:01 2011	(r227871)
+++ head/sys/dev/ath/if_ath.c	Wed Nov 23 07:12:26 2011	(r227872)
@@ -5370,6 +5370,7 @@ ath_calibrate(void *arg)
 			sc->sc_doresetcal = AH_TRUE;
 			ATH_UNLOCK(sc);
 			ath_reset(ifp, ATH_RESET_NOLOSS);
+			ATH_LOCK(sc);
 			return;
 		}
 		/*