diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-17 13:08:56 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-18 06:51:13 -0500 |
commit | f29af97853599e9537191c4f33f8ac87f3f503a9 (patch) | |
tree | 4848d9abf39030933b6b6c6a12765a4942377f57 | |
parent | 46d33a21cfa531f4271c3f0b7b87a295f30f9e6a (diff) |
ath6kl: add ATH6KL_CONF_UART_DEBUG
Add ATH6KL_CONF_UART_DEBUG which is set whenever uart_debug module
parameter is enabled. This way we can keep the uart_debug parameter
static when core.c file is introduced.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/init.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h index bdeb254c259c..78c0402e2d33 100644 --- a/drivers/net/wireless/ath/ath6kl/core.h +++ b/drivers/net/wireless/ath/ath6kl/core.h | |||
@@ -197,6 +197,7 @@ struct ath6kl_fw_ie { | |||
197 | #define ATH6KL_CONF_ENABLE_11N BIT(2) | 197 | #define ATH6KL_CONF_ENABLE_11N BIT(2) |
198 | #define ATH6KL_CONF_ENABLE_TX_BURST BIT(3) | 198 | #define ATH6KL_CONF_ENABLE_TX_BURST BIT(3) |
199 | #define ATH6KL_CONF_SUSPEND_CUTPOWER BIT(4) | 199 | #define ATH6KL_CONF_SUSPEND_CUTPOWER BIT(4) |
200 | #define ATH6KL_CONF_UART_DEBUG BIT(5) | ||
200 | 201 | ||
201 | enum wlan_low_pwr_state { | 202 | enum wlan_low_pwr_state { |
202 | WLAN_POWER_STATE_ON, | 203 | WLAN_POWER_STATE_ON, |
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 7e56a6aa70b9..2804921d5d8a 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c | |||
@@ -469,7 +469,7 @@ int ath6kl_configure_target(struct ath6kl *ar) | |||
469 | u8 fw_iftype, fw_mode = 0, fw_submode = 0; | 469 | u8 fw_iftype, fw_mode = 0, fw_submode = 0; |
470 | int i, status; | 470 | int i, status; |
471 | 471 | ||
472 | param = uart_debug; | 472 | param = !!(ar->conf_flags & ATH6KL_CONF_UART_DEBUG); |
473 | if (ath6kl_bmi_write(ar, ath6kl_get_hi_item_addr(ar, | 473 | if (ath6kl_bmi_write(ar, ath6kl_get_hi_item_addr(ar, |
474 | HI_ITEM(hi_serial_enable)), (u8 *)¶m, 4)) { | 474 | HI_ITEM(hi_serial_enable)), (u8 *)¶m, 4)) { |
475 | ath6kl_err("bmi_write_memory for uart debug failed\n"); | 475 | ath6kl_err("bmi_write_memory for uart debug failed\n"); |
@@ -1775,6 +1775,9 @@ int ath6kl_core_init(struct ath6kl *ar) | |||
1775 | if (suspend_cutpower) | 1775 | if (suspend_cutpower) |
1776 | ar->conf_flags |= ATH6KL_CONF_SUSPEND_CUTPOWER; | 1776 | ar->conf_flags |= ATH6KL_CONF_SUSPEND_CUTPOWER; |
1777 | 1777 | ||
1778 | if (uart_debug) | ||
1779 | ar->conf_flags |= ATH6KL_CONF_UART_DEBUG; | ||
1780 | |||
1778 | ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM | | 1781 | ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM | |
1779 | WIPHY_FLAG_HAVE_AP_SME | | 1782 | WIPHY_FLAG_HAVE_AP_SME | |
1780 | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | | 1783 | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | |