iwlwifi: mvm: Disable managed PS when GO is added

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / trace.h

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index c5899797a8d4b0f01da791da6e2b1be8a685627f..c215fafd7a2fc1ac3e206b4551c60de8d656ab24 100644 (file)
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -28,27 +28,27 @@
 #define VIF_PR_FMT     " vif:%s(%d%s)"
 #define VIF_PR_ARG     __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
 
-#define CHANDEF_ENTRY  __field(u32, control_freq)                              \
-                       __field(u32, chan_width)                                \
-                       __field(u32, center_freq1)                              \
+#define CHANDEF_ENTRY  __field(u32, control_freq)                                      \
+                       __field(u32, chan_width)                                        \
+                       __field(u32, center_freq1)                                      \
                        __field(u32, center_freq2)
-#define CHANDEF_ASSIGN(c)                                                      \
-                       __entry->control_freq = (c)->chan->center_freq;         \
-                       __entry->chan_width = (c)->width;                       \
-                       __entry->center_freq1 = (c)->center_freq1;              \
+#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_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
 
-#define CHANCTX_ENTRY  CHANDEF_ENTRY                                           \
-                       __field(u8, rx_chains_static)                           \
+#define CHANCTX_ENTRY  CHANDEF_ENTRY                                                   \
+                       __field(u8, rx_chains_static)                                   \
                        __field(u8, rx_chains_dynamic)
-#define CHANCTX_ASSIGN CHANDEF_ASSIGN(&ctx->conf.def)                          \
-                       __entry->rx_chains_static = ctx->conf.rx_chains_static; \
+#define CHANCTX_ASSIGN CHANDEF_ASSIGN(&ctx->conf.def)                                  \
+                       __entry->rx_chains_static = ctx->conf.rx_chains_static;         \
                        __entry->rx_chains_dynamic = ctx->conf.rx_chains_dynamic
 #define CHANCTX_PR_FMT CHANDEF_PR_FMT " chains:%d/%d"
-#define CHANCTX_PR_ARG CHANDEF_PR_ARG,                                         \
+#define CHANCTX_PR_ARG CHANDEF_PR_ARG,                                                 \
                        __entry->rx_chains_static, __entry->rx_chains_dynamic
 
 
@@ -286,8 +286,7 @@ TRACE_EVENT(drv_config,
                __field(u16, listen_interval)
                __field(u8, long_frame_max_tx_count)
                __field(u8, short_frame_max_tx_count)
-               __field(int, center_freq)
-               __field(int, channel_type)
+               CHANDEF_ENTRY
                __field(int, smps)
        ),
 
@@ -303,15 +302,13 @@ TRACE_EVENT(drv_config,
                        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;
+               CHANDEF_ASSIGN(&local->hw.conf.chandef)
                __entry->smps = local->hw.conf.smps_mode;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " ch:%#x freq:%d",
-               LOCAL_PR_ARG, __entry->changed, __entry->center_freq
+               LOCAL_PR_FMT " ch:%#x" CHANDEF_PR_FMT,
+               LOCAL_PR_ARG, __entry->changed, CHANDEF_PR_ARG
        )
 );
 
@@ -359,8 +356,7 @@ TRACE_EVENT(drv_bss_info_changed,
                __dynamic_array(u8, ssid, info->ssid_len);
                __field(bool, hidden_ssid);
                __field(int, txpower)
-               __field(u8, p2p_ctwindow)
-               __field(bool, p2p_oppps)
+               __field(u8, p2p_oppps_ctwindow)
        ),
 
        TP_fast_assign(
@@ -400,8 +396,7 @@ TRACE_EVENT(drv_bss_info_changed,
                memcpy(__get_dynamic_array(ssid), info->ssid, info->ssid_len);
                __entry->hidden_ssid = info->hidden_ssid;
                __entry->txpower = info->txpower;
-               __entry->p2p_ctwindow = info->p2p_ctwindow;
-               __entry->p2p_oppps = info->p2p_oppps;
+               __entry->p2p_oppps_ctwindow = info->p2p_noa_attr.oppps_ctwindow;
        ),
 
        TP_printk(
@@ -995,23 +990,23 @@ TRACE_EVENT(drv_channel_switch,
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
+               CHANDEF_ENTRY
                __field(u64, timestamp)
                __field(bool, block_tx)
-               __field(u16, freq)
                __field(u8, count)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
+               CHANDEF_ASSIGN(&ch_switch->chandef)
                __entry->timestamp = ch_switch->timestamp;
                __entry->block_tx = ch_switch->block_tx;
-               __entry->freq = ch_switch->channel->center_freq;
                __entry->count = ch_switch->count;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " new freq:%u count:%d",
-               LOCAL_PR_ARG, __entry->freq, __entry->count
+               LOCAL_PR_FMT " new " CHANDEF_PR_FMT " count:%d",
+               LOCAL_PR_ARG, CHANDEF_PR_ARG, __entry->count
        )
 );