Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 254d3dfe authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg
Browse files

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: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4baf6bea

net/mac80211/trace.h

+5 −5
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ 
			__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;

			__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