diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 25ae88ebdfac..84f44269de47 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
@@ -23,9 +23,6 @@ | |||
23 | #define REG_READ_D(_ah, _reg) \ | 23 | #define REG_READ_D(_ah, _reg) \ |
24 | ath9k_hw_common(_ah)->ops->read((_ah), (_reg)) | 24 | ath9k_hw_common(_ah)->ops->read((_ah), (_reg)) |
25 | 25 | ||
26 | static unsigned int ath9k_debug = ATH_DBG_DEFAULT; | ||
27 | module_param_named(debug, ath9k_debug, uint, 0); | ||
28 | |||
29 | static struct dentry *ath9k_debugfs_root; | 26 | static struct dentry *ath9k_debugfs_root; |
30 | 27 | ||
31 | static int ath9k_debugfs_open(struct inode *inode, struct file *file) | 28 | static int ath9k_debugfs_open(struct inode *inode, struct file *file) |
@@ -565,8 +562,6 @@ int ath9k_init_debug(struct ath_hw *ah) | |||
565 | struct ath_common *common = ath9k_hw_common(ah); | 562 | struct ath_common *common = ath9k_hw_common(ah); |
566 | struct ath_softc *sc = (struct ath_softc *) common->priv; | 563 | struct ath_softc *sc = (struct ath_softc *) common->priv; |
567 | 564 | ||
568 | common->debug_mask = ath9k_debug; | ||
569 | |||
570 | if (!ath9k_debugfs_root) | 565 | if (!ath9k_debugfs_root) |
571 | return -ENOENT; | 566 | return -ENOENT; |
572 | 567 | ||
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 86374ad9313c..7f90cb872a69 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -29,6 +29,10 @@ static int modparam_nohwcrypt; | |||
29 | module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444); | 29 | module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444); |
30 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); | 30 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); |
31 | 31 | ||
32 | static unsigned int ath9k_debug = ATH_DBG_DEFAULT; | ||
33 | module_param_named(debug, ath9k_debug, uint, 0); | ||
34 | MODULE_PARM_DESC(ath9k_debug, "Debugging mask"); | ||
35 | |||
32 | /* We use the hw_value as an index into our private channel structure */ | 36 | /* We use the hw_value as an index into our private channel structure */ |
33 | 37 | ||
34 | #define CHAN2G(_freq, _idx) { \ | 38 | #define CHAN2G(_freq, _idx) { \ |
@@ -1637,6 +1641,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, | |||
1637 | common->ah = ah; | 1641 | common->ah = ah; |
1638 | common->hw = sc->hw; | 1642 | common->hw = sc->hw; |
1639 | common->priv = sc; | 1643 | common->priv = sc; |
1644 | common->debug_mask = ath9k_debug; | ||
1640 | 1645 | ||
1641 | /* | 1646 | /* |
1642 | * Cache line size is used to size and align various | 1647 | * Cache line size is used to size and align various |