From 04bec01c03610996bd57e7f95a31a7716870a3a3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Thu, 26 Jul 2012 14:27:39 +0200 Subject: [PATCH] --- yaml --- r: 327669 b: refs/heads/master c: 3d01be72e6fe372a0602221090707a1f04c44646 h: refs/heads/master i: 327667: 1221ae632c5b62a4951ae679e567102321d3de36 v: v3 --- [refs] | 2 +- trunk/net/mac80211/trace.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 095d967f70cc..0da06b18e8e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9e6e95b63758202fe2ce43bd7c922db2ff50f80 +refs/heads/master: 3d01be72e6fe372a0602221090707a1f04c44646 diff --git a/trunk/net/mac80211/trace.h b/trunk/net/mac80211/trace.h index 65e9a2a1a3e1..18d9c8a52e9e 100644 --- a/trunk/net/mac80211/trace.h +++ b/trunk/net/mac80211/trace.h @@ -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; ),