aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ath/main.c')
-rw-r--r--[-rwxr-xr-x]drivers/net/wireless/ath/main.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index 947ef45..ea2c737 100755..100644
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -57,24 +57,22 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
}
EXPORT_SYMBOL(ath_rxbuf_alloc);
-void ath_printk(const char *level, const char *fmt, ...)
+void ath_printk(const char *level, const struct ath_common* common,
+ const char *fmt, ...)
{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
struct va_format vaf;
-#endif
va_list args;
va_start(args, fmt);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
vaf.fmt = fmt;
vaf.va = &args;
- printk("%sath: %pV", level, &vaf);
-#else
- printk("%sath: ", level);
- vprintk(fmt, args);
-#endif
+ if (common && common->hw && common->hw->wiphy)
+ printk("%sath: %s: %pV",
+ level, wiphy_name(common->hw->wiphy), &vaf);
+ else
+ printk("%sath: %pV", level, &vaf);
va_end(args);
}