mac80211: update to latest version from trunk

[openwrt-10.03/.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 5ac97be0a140e01a0430d20b2a0d3c627438cda1..646ed1cf63273de77bd599928b6912e7edf3cdf3 100644 (file)
--- a/package/mac80211/patches/018-revert_printk_va_format.patch
+++ b/package/mac80211/patches/018-revert_printk_va_format.patch
@@ -1,6 +1,6 @@
 --- 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 *
+@@ -339,83 +339,59 @@ static int b43_ratelimit(struct b43_wl *
  
  void b43info(struct b43_wl *wl, const char *fmt, ...)
  {
@@ -98,7 +98,7 @@
  
 --- a/drivers/net/wireless/b43legacy/main.c
 +++ b/drivers/net/wireless/b43legacy/main.c
-@@ -181,75 +181,52 @@ static int b43legacy_ratelimit(struct b4
+@@ -179,75 +179,52 @@ static int b43legacy_ratelimit(struct b4
  
  void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
  {
@@ -186,24 +186,3 @@
        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);
-