From f3e8d285fdf48589fcb0b628ea0449ee8a82ab67 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 14 Mar 2012 16:07:46 -0700 Subject: [PATCH] compat-wireless: fix patches/37-vsnprintk.patch Signed-off-by: Luis R. Rodriguez --- patches/37-vsnprintk.patch | 44 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/patches/37-vsnprintk.patch b/patches/37-vsnprintk.patch index 8217de9e1297..e31391703c68 100644 --- a/patches/37-vsnprintk.patch +++ b/patches/37-vsnprintk.patch @@ -1,25 +1,35 @@ --- a/drivers/net/wireless/ath/main.c +++ b/drivers/net/wireless/ath/main.c -@@ -59,15 +59,22 @@ EXPORT_SYMBOL(ath_rxbuf_alloc); - - void ath_printk(const char *level, const char *fmt, ...) - { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - struct va_format vaf; -+#endif - va_list args; - - va_start(args, fmt); +@@ -57,6 +57,7 @@ struct sk_buff *ath_rxbuf_alloc(struct a + } + EXPORT_SYMBOL(ath_rxbuf_alloc); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - vaf.fmt = fmt; - vaf.va = &args; + void ath_printk(const char *level, const struct ath_common* common, + const char *fmt, ...) + { +@@ -76,4 +77,24 @@ void ath_printk(const char *level, const - printk("%sath: %pV", level, &vaf); + va_end(args); + } +#else -+ printk("%sath: ", level); ++void ath_printk(const char *level, const struct ath_common* common, ++ const char *fmt, ...) ++{ ++ va_list args; ++ ++ va_start(args, fmt); ++ ++ if (common && common->hw && common->hw->wiphy) ++ printk("%sath: %s: ", ++ level, wiphy_name(common->hw->wiphy)); ++ else ++ printk("%sath: ", level); ++ + vprintk(fmt, args); ++ ++ va_end(args); ++} +#endif - - va_end(args); - } ++ + EXPORT_SYMBOL(ath_printk); -- 2.30.2