3.13.11-ckt31 -stable review patch. If anyone has any objections, please let
me know.
------------------
From: Arik Nemtsov <a...@wizery.com>
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 <arikx.nemt...@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumb...@intel.com>
Signed-off-by: Johannes Berg <johannes.b...@intel.com>
Signed-off-by: Kamal Mostafa <ka...@canonical.com>
---
net/mac80211/trace.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index d4cee98..383884d 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -32,11 +32,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
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
