summaryrefslogtreecommitdiff
path: root/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-30 22:25:54 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-06 22:54:26 +0100
commit9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch)
tree9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
parentb198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff)
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports: * patches/0090-use-skb_pad.patch This patch was manually modified: * patches/0025-usb-sg/usbnet.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch')
-rw-r--r--patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
index dba0a1de..d323f7ad 100644
--- a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
+++ b/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
-@@ -74,13 +74,16 @@ void __iwl_ ##fn(struct device *dev, con
+@@ -69,13 +69,16 @@ void __iwl_ ##fn(struct device *dev, con
struct va_format vaf = { \
.fmt = fmt, \
}; \
@@ -21,7 +21,7 @@
}
__iwl_fn(warn)
-@@ -99,13 +102,18 @@ void __iwl_err(struct device *dev, bool
+@@ -94,13 +97,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);
}
-@@ -122,13 +130,19 @@ void __iwl_dbg(struct device *dev,
+@@ -117,13 +125,19 @@ void __iwl_dbg(struct device *dev,
va_list args;
va_start(args, fmt);