This is a note to let you know that I've just added the patch titled
mac80211: allow null chandef in tracing
to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-allow-null-chandef-in-tracing.patch
and it can be found in the queue-4.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 254d3dfe445f94a764e399ca12e04365ac9413ed Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <[email protected]>
Date: Sun, 25 Oct 2015 10:59:41 +0200
Subject: mac80211: allow null chandef in tracing
From: Arik Nemtsov <[email protected]>
commit 254d3dfe445f94a764e399ca12e04365ac9413ed upstream.
In TDLS channel-switch operations the chandef can sometimes be NULL.
Avoid an oops in the trace code for these cases and just print a
chandef full of zeros.
Fixes: a7a6bdd0670fe ("mac80211: introduce TDLS channel switch ops")
Signed-off-by: Arik Nemtsov <[email protected]>
Signed-off-by: Emmanuel Grumbach <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/mac80211/trace.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -33,11 +33,11 @@
__field(u32, chan_width)
\
__field(u32, center_freq1)
\
__field(u32, center_freq2)
-#define CHANDEF_ASSIGN(c)
\
- __entry->control_freq = (c)->chan ?
(c)->chan->center_freq : 0; \
- __entry->chan_width = (c)->width;
\
- __entry->center_freq1 = (c)->center_freq1;
\
- __entry->center_freq2 = (c)->center_freq2;
+#define CHANDEF_ASSIGN(c)
\
+ __entry->control_freq = (c) ? ((c)->chan ?
(c)->chan->center_freq : 0) : 0; \
+ __entry->chan_width = (c) ? (c)->width : 0;
\
+ __entry->center_freq1 = (c) ? (c)->center_freq1 : 0;
\
+ __entry->center_freq2 = (c) ? (c)->center_freq2 : 0;
#define CHANDEF_PR_FMT " control:%d MHz width:%d center: %d/%d MHz"
#define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width,
\
__entry->center_freq1, __entry->center_freq2
Patches currently in stable-queue which might be from [email protected] are
queue-4.3/mac80211-allow-null-chandef-in-tracing.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
