aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-08-03 12:24:38 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:44:28 -0400
commite1e2f93ffacab692823209e00a124e802039aa9a (patch)
treebbe9627bf04b2a9b2ba9f787d4302dbd4fd60c02
parent8df5d1b77395271dd9b75ed2b9aa9235f7589a0d (diff)
ath9k: move cache setting of softc ah prior to attach
We do this in case attach and friends try to get back to ah from the softc somehow. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index fa2c230c3c2..605d3280733 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1332,6 +1332,7 @@ static int ath_init(u16 devid, struct ath_softc *sc)
ah->ah_sc = sc;
ah->hw_version.devid = devid;
+ sc->sc_ah = ah;
r = ath9k_hw_attach(ah, sc);
if (r) {
@@ -1340,7 +1341,6 @@ static int ath_init(u16 devid, struct ath_softc *sc)
"initialization status: %d\n", r);
goto bad;
}
- sc->sc_ah = ah;
/* Get the hardware key cache size. */
sc->keymax = ah->caps.keycache_size;