39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Thu, 13 Nov 2014 18:27:47 +0100
|
|
Subject: [PATCH] ath9k: prevent early IRQs from accessing hardware
|
|
|
|
IRQs are suppressed if ah == NULL and ATH_OP_INVALID being set in
|
|
common->op_flags. Close a short time window between those two.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -513,10 +513,14 @@ static int ath9k_init_softc(u16 devid, s
|
|
ah->reg_ops.read = ath9k_ioread32;
|
|
ah->reg_ops.write = ath9k_iowrite32;
|
|
ah->reg_ops.rmw = ath9k_reg_rmw;
|
|
- sc->sc_ah = ah;
|
|
pCap = &ah->caps;
|
|
|
|
common = ath9k_hw_common(ah);
|
|
+
|
|
+ /* Will be cleared in ath9k_start() */
|
|
+ set_bit(ATH_OP_INVALID, &common->op_flags);
|
|
+
|
|
+ sc->sc_ah = ah;
|
|
sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
|
|
sc->tx99_power = MAX_RATE_POWER + 1;
|
|
init_waitqueue_head(&sc->tx_wait);
|
|
@@ -876,9 +880,6 @@ int ath9k_init_device(u16 devid, struct
|
|
common = ath9k_hw_common(ah);
|
|
ath9k_set_hw_capab(sc, hw);
|
|
|
|
- /* Will be cleared in ath9k_start() */
|
|
- set_bit(ATH_OP_INVALID, &common->op_flags);
|
|
-
|
|
/* Initialize regulatory */
|
|
error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
|
|
ath9k_reg_notifier);
|