diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
commit | 30498b130cc0476e73f5142dcc63bc271da2d89b (patch) | |
tree | 4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/56-mac80211-trace-fix | |
parent | a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff) |
refresh patches against next-20130328
The patches were last refreshed against that same tree,
so the only change is that now we have -p in there, which
results in changes like this (only):
-@@ -1593,7 +1593,7 @@
+@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
This makes the patches more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/56-mac80211-trace-fix')
-rw-r--r-- | patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch b/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch index 6dc72946..183cec25 100644 --- a/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch +++ b/patches/collateral-evolutions/network/56-mac80211-trace-fix/net_mac80211_trace.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/trace.c +++ b/net/mac80211/trace.c -@@ -15,12 +15,16 @@ +@@ -15,12 +15,16 @@ void __sdata_info(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -19,7 +19,7 @@ trace_mac80211_info(&vaf); va_end(args); } -@@ -33,10 +37,16 @@ +@@ -33,10 +37,16 @@ void __sdata_dbg(bool print, const char va_list args; va_start(args, fmt); @@ -38,7 +38,7 @@ trace_mac80211_dbg(&vaf); va_end(args); } -@@ -46,12 +56,16 @@ +@@ -46,12 +56,16 @@ void __sdata_err(const char *fmt, ...) struct va_format vaf = { .fmt = fmt, }; @@ -57,7 +57,7 @@ trace_mac80211_err(&vaf); va_end(args); } -@@ -64,10 +78,16 @@ +@@ -64,10 +78,16 @@ void __wiphy_dbg(struct wiphy *wiphy, bo va_list args; va_start(args, fmt); |