mac80211: don't assume channel is set in tracing (3d01be72) · Commits · 戴 / test

With the move to multi-channel and away from drv_config(), hw.conf.channel will not always be set, only for devices using the current API instead of the new channel context APIs. Check the channel is set before adding its frequency to the trace data. Also break some overly long lines in the code. Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/mac80211/trace.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -274,9 +274,12 @@ TRACE_EVENT(drv_config,
		__entry->dynamic_ps_timeout = local->hw.conf.dynamic_ps_timeout;
		__entry->max_sleep_period = local->hw.conf.max_sleep_period;
		__entry->listen_interval = local->hw.conf.listen_interval;
		__entry->long_frame_max_tx_count = local->hw.conf.long_frame_max_tx_count;
		__entry->short_frame_max_tx_count = local->hw.conf.short_frame_max_tx_count;
		__entry->center_freq = local->hw.conf.channel->center_freq;
		__entry->long_frame_max_tx_count =
		local->hw.conf.long_frame_max_tx_count;
		__entry->short_frame_max_tx_count =
		local->hw.conf.short_frame_max_tx_count;
		__entry->center_freq = local->hw.conf.channel ?
		local->hw.conf.channel->center_freq : 0;
		__entry->channel_type = local->hw.conf.channel_type;
		__entry->smps = local->hw.conf.smps_mode;
		),

Admin message