From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Tue, 13 May 2014 13:19:12 +0000 (+0300)
Subject: backport: update drivers_net_wireless_iwlwifi_iwl-debug.patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=841e1457a5677b2670b4945d23bf0f4b5905bac0;p=openwrt%2Fstaging%2Fblogic.git

backport: update drivers_net_wireless_iwlwifi_iwl-debug.patch

The driver was updated - need to update the patch accordingly

commit 7f715626a9ddfa7df13f076f59fc62e3c99066cf
Author: Liad Kaufman <liad.kaufman@intel.com>
Date:   Thu May 8 15:24:54 2014 +0300

    iwlwifi: use dev_printk instead of dev_dbg for debug logs

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/patches/collateral-evolutions/network/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/collateral-evolutions/network/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
index 3e454e21939f..2c6c6600ad35 100644
--- a/patches/collateral-evolutions/network/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
+++ b/patches/collateral-evolutions/network/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlwifi/iwl-debug.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
-@@ -76,13 +76,16 @@ void __iwl_ ##fn(struct device *dev, con
+@@ -74,13 +74,16 @@ void __iwl_ ##fn(struct device *dev, con
  	struct va_format vaf = {				\
  		.fmt = fmt,					\
  	};							\
@@ -21,7 +21,7 @@
  }
  
  __iwl_fn(warn)
-@@ -101,13 +104,18 @@ void __iwl_err(struct device *dev, bool
+@@ -99,13 +102,18 @@ void __iwl_err(struct device *dev, bool
  	va_list args;
  
  	va_start(args, fmt);
@@ -41,7 +41,7 @@
  	trace_iwlwifi_err(&vaf);
  	va_end(args);
  }
-@@ -124,13 +132,19 @@ void __iwl_dbg(struct device *dev,
+@@ -122,13 +130,19 @@ void __iwl_dbg(struct device *dev,
  	va_list args;
  
  	va_start(args, fmt);
@@ -54,8 +54,8 @@
 +
 +		va_copy(args2, args);
 +		vaf.va = &args2;
- 		dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
- 			function, &vaf);
+ 		dev_printk(KERN_DEBUG, dev, "%c %s %pV",
+ 			   in_interrupt() ? 'I' : 'U', function, &vaf);
 +		va_end(args2);
 +	}
  #endif