diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-08-03 15:24:38 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-04 16:44:28 -0400 |
commit | e1e2f93ffacab692823209e00a124e802039aa9a (patch) | |
tree | bbe9627bf04b2a9b2ba9f787d4302dbd4fd60c02 | |
parent | 8df5d1b77395271dd9b75ed2b9aa9235f7589a0d (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.c | 2 |
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 fa2c230c3c2f..605d3280733a 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) | |||
1332 | 1332 | ||
1333 | ah->ah_sc = sc; | 1333 | ah->ah_sc = sc; |
1334 | ah->hw_version.devid = devid; | 1334 | ah->hw_version.devid = devid; |
1335 | sc->sc_ah = ah; | ||
1335 | 1336 | ||
1336 | r = ath9k_hw_attach(ah, sc); | 1337 | r = ath9k_hw_attach(ah, sc); |
1337 | if (r) { | 1338 | if (r) { |
@@ -1340,7 +1341,6 @@ static int ath_init(u16 devid, struct ath_softc *sc) | |||
1340 | "initialization status: %d\n", r); | 1341 | "initialization status: %d\n", r); |
1341 | goto bad; | 1342 | goto bad; |
1342 | } | 1343 | } |
1343 | sc->sc_ah = ah; | ||
1344 | 1344 | ||
1345 | /* Get the hardware key cache size. */ | 1345 | /* Get the hardware key cache size. */ |
1346 | sc->keymax = ah->caps.keycache_size; | 1346 | sc->keymax = ah->caps.keycache_size; |