Rename debug_mask variable to ath10k_debug_mask. Fixes a linker error:
drivers/net/wireless/ath/ath10k/built-in.o: In function `ath10k_add_interface':
/home/kvalo/ath10k/src/ath10k/drivers/net/wireless/ath/ath10k/mac.c:1710:
multiple definition of `debug_mask'
drivers/net/wireless/ath/ath6kl/built-in.o:/home/kvalo/ath10k/src/ath10k/include/linux/list.h:188:
first defined here
This changes just the variable, the name of kernel module parameters
stays the same.
Signed-off-by: Kalle Valo <kv...@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath10k/core.c | 4 ++--
drivers/net/wireless/ath/ath10k/debug.c | 4 ++--
drivers/net/wireless/ath/ath10k/debug.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c
b/drivers/net/wireless/ath/ath10k/core.c
index a3afb79..d0d8521 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -27,10 +27,10 @@
#include "debug.h"
#include "htt.h"
-unsigned int debug_mask;
+unsigned int ath10k_debug_mask;
static bool uart_print;
static unsigned int ath10k_p2p;
-module_param(debug_mask, uint, 0644);
+module_param_named(debug_mask, ath10k_debug_mask, uint, 0644);
module_param(uart_print, bool, 0644);
module_param(ath10k_p2p, uint, 0644);
MODULE_PARM_DESC(debug_mask, "Debugging mask");
diff --git a/drivers/net/wireless/ath/ath10k/debug.c
b/drivers/net/wireless/ath/ath10k/debug.c
index 040cdcd..aa9f66f 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -476,7 +476,7 @@ void ath10k_dbg(enum ath10k_debug_mask mask, const char
*fmt, ...)
vaf.fmt = fmt;
vaf.va = &args;
- if (debug_mask & mask)
+ if (ath10k_debug_mask & mask)
ath10k_printk(KERN_DEBUG, "%pV", &vaf);
trace_ath10k_log_dbg(mask, &vaf);
@@ -489,7 +489,7 @@ void ath10k_dbg_dump(enum ath10k_debug_mask mask,
const char *msg, const char *prefix,
const void *buf, size_t len)
{
- if (debug_mask & mask) {
+ if (ath10k_debug_mask & mask) {
if (msg)
ath10k_dbg(mask, "%s\n", msg);
diff --git a/drivers/net/wireless/ath/ath10k/debug.h
b/drivers/net/wireless/ath/ath10k/debug.h
index bbaaa37..e7fb640 100644
--- a/drivers/net/wireless/ath/ath10k/debug.h
+++ b/drivers/net/wireless/ath/ath10k/debug.h
@@ -34,7 +34,7 @@ enum ath10k_debug_mask {
ATH10K_DBG_ANY = 0xffffffff,
};
-extern unsigned int debug_mask;
+extern unsigned int ath10k_debug_mask;
extern __printf(1, 2) int ath10k_info(const char *fmt, ...);
extern __printf(1, 2) int ath10k_err(const char *fmt, ...);
_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
