summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2011-11-23 07:12:26 +0000
committeradrian <adrian@FreeBSD.org>2011-11-23 07:12:26 +0000
commitc63bdaa471ccbec3301b354cc7f4eff41ad91afc (patch)
tree8f50efc7ad7de22d94631c1a6d2503b0c8dfad23 /sys/dev
parent129fabf7506e156896e63540773131c698937026 (diff)
downloadFreeBSD-src-c63bdaa471ccbec3301b354cc7f4eff41ad91afc.zip
FreeBSD-src-c63bdaa471ccbec3301b354cc7f4eff41ad91afc.tar.gz
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.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ath/if_ath.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index ce69f0b..2f7cf79 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -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;
}
/*
OpenPOWER on IntegriCloud