From: Kalle Valo <kvalo@qca.qualcomm.com>
To: kvalo@qca.qualcomm.com
Cc: ath6kl-devel@qualcomm.com, linux-wireless@vger.kernel.org
Subject: [PATCH v3 3/8] ath6kl: add ATH6KL_CONF_UART_DEBUG
Date: Tue, 17 Jan 2012 20:08:56 +0200 [thread overview]
Message-ID: <20120117180856.29995.25607.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20120117180827.29995.67922.stgit@localhost6.localdomain6>
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 | 1 +
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 a75c09e..5b48ed4 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -195,6 +195,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,
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 6baa855..911e2df 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -466,7 +466,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 *)¶m, 4)) {
ath6kl_err("bmi_write_memory for uart debug failed\n");
@@ -1679,6 +1679,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 |
next prev parent reply other threads:[~2012-01-17 18:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-17 18:08 [PATCH v3 1/8] ath6kl: rename vif init and cleanup functions Kalle Valo
2012-01-17 18:08 ` [PATCH v3 2/8] ath6kl: unify cfg80211 init/cleanup functions Kalle Valo
2012-01-17 18:08 ` Kalle Valo [this message]
2012-01-17 18:09 ` [PATCH v3 4/8] ath6kl: create core.c Kalle Valo
2012-01-17 18:09 ` [PATCH v3 5/8] ath6kl: get rid of AR_DBG_LVL_CHECK() Kalle Valo
2012-01-17 18:09 ` [PATCH v3 6/8] ath6kl: convert ath6kl_dbg() and ath6kl_dbg_dump() into functions Kalle Valo
2012-01-17 18:09 ` [PATCH v3 7/8] ath6kl: create ath6kl_core.ko Kalle Valo
2012-01-17 18:09 ` [PATCH v3 8/8] ath6kl: add back beginnings of USB support Kalle Valo
2012-01-17 18:13 ` [PATCH v3 1/8] ath6kl: rename vif init and cleanup functions Kalle Valo
2012-01-18 12:09 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120117180856.29995.25607.stgit@localhost6.localdomain6 \
--to=kvalo@qca.qualcomm.com \
--cc=ath6kl-devel@qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).