ath6kl: add ATH6KL_CONF_UART_DEBUG
authorKalle Valo <kvalo@qca.qualcomm.com>
Tue, 17 Jan 2012 18:08:56 +0000 (20:08 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 18 Jan 2012 11:51:13 +0000 (13:51 +0200)
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>
drivers/net/wireless/ath/ath6kl/core.h
drivers/net/wireless/ath/ath6kl/init.c

index bdeb254..78c0402 100644 (file)
@@ -197,6 +197,7 @@ struct ath6kl_fw_ie {
 #define ATH6KL_CONF_ENABLE_11N                 BIT(2)
 #define ATH6KL_CONF_ENABLE_TX_BURST            BIT(3)
 #define ATH6KL_CONF_SUSPEND_CUTPOWER           BIT(4)
+#define ATH6KL_CONF_UART_DEBUG                 BIT(5)
 
 enum wlan_low_pwr_state {
        WLAN_POWER_STATE_ON,
index 7e56a6a..2804921 100644 (file)
@@ -469,7 +469,7 @@ int ath6kl_configure_target(struct ath6kl *ar)
        u8 fw_iftype, fw_mode = 0, fw_submode = 0;
        int i, status;
 
-       param = uart_debug;
+       param = !!(ar->conf_flags & ATH6KL_CONF_UART_DEBUG);
        if (ath6kl_bmi_write(ar, ath6kl_get_hi_item_addr(ar,
                             HI_ITEM(hi_serial_enable)), (u8 *)&param, 4)) {
                ath6kl_err("bmi_write_memory for uart debug failed\n");
@@ -1775,6 +1775,9 @@ int ath6kl_core_init(struct ath6kl *ar)
        if (suspend_cutpower)
                ar->conf_flags |= ATH6KL_CONF_SUSPEND_CUTPOWER;
 
+       if (uart_debug)
+               ar->conf_flags |= ATH6KL_CONF_UART_DEBUG;
+
        ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                            WIPHY_FLAG_HAVE_AP_SME |
                            WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |