提交 254d3dfe 编写于 作者: A Arik Nemtsov 提交者: Johannes Berg

mac80211: allow null chandef in tracing

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.

Cc: stable@vger.kernel.org
Fixes: a7a6bdd0 ("mac80211: introduce TDLS channel switch ops")
Signed-off-by: NArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
上级 4baf6bea
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
__field(u32, chan_width) \ __field(u32, chan_width) \
__field(u32, center_freq1) \ __field(u32, center_freq1) \
__field(u32, center_freq2) __field(u32, center_freq2)
#define CHANDEF_ASSIGN(c) \ #define CHANDEF_ASSIGN(c) \
__entry->control_freq = (c)->chan ? (c)->chan->center_freq : 0; \ __entry->control_freq = (c) ? ((c)->chan ? (c)->chan->center_freq : 0) : 0; \
__entry->chan_width = (c)->width; \ __entry->chan_width = (c) ? (c)->width : 0; \
__entry->center_freq1 = (c)->center_freq1; \ __entry->center_freq1 = (c) ? (c)->center_freq1 : 0; \
__entry->center_freq2 = (c)->center_freq2; __entry->center_freq2 = (c) ? (c)->center_freq2 : 0;
#define CHANDEF_PR_FMT " control:%d MHz width:%d center: %d/%d MHz" #define CHANDEF_PR_FMT " control:%d MHz width:%d center: %d/%d MHz"
#define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \ #define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \
__entry->center_freq1, __entry->center_freq2 __entry->center_freq1, __entry->center_freq2
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册