mac80211: fix a missing return value

[openwrt.git] / package / mac80211 / patches / 018-revert_printk_va_format.patch

diff --git a/package/mac80211/patches/018-revert_printk_va_format.patch b/package/mac80211/patches/018-revert_printk_va_format.patch
index d50022e..5ac97be 100644 (file)
--- a/package/mac80211/patches/018-revert_printk_va_format.patch
+++ b/package/mac80211/patches/018-revert_printk_va_format.patch
@@ -1,27 +1,3 @@
---- a/drivers/net/wireless/ath/debug.c
-+++ b/drivers/net/wireless/ath/debug.c
-@@ -19,19 +19,14 @@
- 
- void ath_print(struct ath_common *common, int dbg_mask, const char *fmt, ...)
- {
--      struct va_format vaf;
-       va_list args;
- 
-       if (likely(!(common->debug_mask & dbg_mask)))
-               return;
- 
-       va_start(args, fmt);
--
--      vaf.fmt = fmt;
--      vaf.va = &args;
--
--      printk(KERN_DEBUG "ath: %pV", &vaf);
--
-+      printk(KERN_DEBUG "ath: ");
-+      vprintk(fmt, args);
-       va_end(args);
- }
- EXPORT_SYMBOL(ath_print);
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
 @@ -322,83 +322,59 @@ static int b43_ratelimit(struct b43_wl *
@@ -210,3 +186,24 @@
        va_end(args);
  }
  #endif /* DEBUG */
+--- a/drivers/net/wireless/ath/main.c
++++ b/drivers/net/wireless/ath/main.c
+@@ -60,16 +60,13 @@ EXPORT_SYMBOL(ath_rxbuf_alloc);
+ int ath_printk(const char *level, struct ath_common *common,
+              const char *fmt, ...)
+ {
+-      struct va_format vaf;
+       va_list args;
+       int rtn;
+ 
+       va_start(args, fmt);
+ 
+-      vaf.fmt = fmt;
+-      vaf.va = &args;
+-
+-      rtn = printk("%sath: %pV", level, &vaf);
++      printk("%sath: ", level);
++      rtn = vprintk(fmt, args);
+ 
+       va_end(args);
+