These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / mac80211 / trace.h

diff --git a/kernel/net/mac80211/trace.h b/kernel/net/mac80211/trace.h
index 4c2e769..56c6d6c 100644 (file)
--- a/kernel/net/mac80211/trace.h
+++ b/kernel/net/mac80211/trace.h
@@ -33,11 +33,11 @@
                        __field(u32, chan_width)                                        \
                        __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;
+#define CHANDEF_ASSIGN(c)                                                      \
+                       __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
@@ -69,6 +69,17 @@
 #define CHANCTX_PR_ARG CHANDEF_PR_ARG, MIN_CHANDEF_PR_ARG,                             \
                        __entry->rx_chains_static, __entry->rx_chains_dynamic
 
+#define KEY_ENTRY      __field(u32, cipher)                                            \
+                       __field(u8, hw_key_idx)                                         \
+                       __field(u8, flags)                                              \
+                       __field(s8, keyidx)
+#define KEY_ASSIGN(k)  __entry->cipher = (k)->cipher;                                  \
+                       __entry->flags = (k)->flags;                                    \
+                       __entry->keyidx = (k)->keyidx;                                  \
+                       __entry->hw_key_idx = (k)->hw_key_idx;
+#define KEY_PR_FMT     " cipher:0x%x, flags=%#x, keyidx=%d, hw_key_idx=%d"
+#define KEY_PR_ARG     __entry->cipher, __entry->flags, __entry->keyidx, __entry->hw_key_idx
+
 
 
 /*
@@ -314,7 +325,6 @@ TRACE_EVENT(drv_config,
                __field(u32, flags)
                __field(int, power_level)
                __field(int, dynamic_ps_timeout)
-               __field(int, max_sleep_period)
                __field(u16, listen_interval)
                __field(u8, long_frame_max_tx_count)
                __field(u8, short_frame_max_tx_count)
@@ -328,7 +338,6 @@ TRACE_EVENT(drv_config,
                __entry->flags = local->hw.conf.flags;
                __entry->power_level = local->hw.conf.power_level;
                __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;
@@ -486,6 +495,36 @@ TRACE_EVENT(drv_configure_filter,
        )
 );
 
+TRACE_EVENT(drv_config_iface_filter,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                unsigned int filter_flags,
+                unsigned int changed_flags),
+
+       TP_ARGS(local, sdata, filter_flags, changed_flags),
+
+       TP_STRUCT__entry(
+               LOCAL_ENTRY
+               VIF_ENTRY
+               __field(unsigned int, filter_flags)
+               __field(unsigned int, changed_flags)
+       ),
+
+       TP_fast_assign(
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               __entry->filter_flags = filter_flags;
+               __entry->changed_flags = changed_flags;
+       ),
+
+       TP_printk(
+               LOCAL_PR_FMT VIF_PR_FMT
+               " filter_flags: %#x changed_flags: %#x",
+               LOCAL_PR_ARG, VIF_PR_ARG, __entry->filter_flags,
+               __entry->changed_flags
+       )
+);
+
 TRACE_EVENT(drv_set_tim,
        TP_PROTO(struct ieee80211_local *local,
                 struct ieee80211_sta *sta, bool set),
@@ -522,25 +561,19 @@ TRACE_EVENT(drv_set_key,
                LOCAL_ENTRY
                VIF_ENTRY
                STA_ENTRY
-               __field(u32, cipher)
-               __field(u8, hw_key_idx)
-               __field(u8, flags)
-               __field(s8, keyidx)
+               KEY_ENTRY
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
                VIF_ASSIGN;
                STA_ASSIGN;
-               __entry->cipher = key->cipher;
-               __entry->flags = key->flags;
-               __entry->keyidx = key->keyidx;
-               __entry->hw_key_idx = key->hw_key_idx;
+               KEY_ASSIGN(key);
        ),
 
        TP_printk(
-               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG
+               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT KEY_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, KEY_PR_ARG
        )
 );
 
@@ -656,28 +689,25 @@ TRACE_EVENT(drv_get_stats,
        )
 );
 
-TRACE_EVENT(drv_get_tkip_seq,
+TRACE_EVENT(drv_get_key_seq,
        TP_PROTO(struct ieee80211_local *local,
-                u8 hw_key_idx, u32 *iv32, u16 *iv16),
+                struct ieee80211_key_conf *key),
 
-       TP_ARGS(local, hw_key_idx, iv32, iv16),
+       TP_ARGS(local, key),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               __field(u8, hw_key_idx)
-               __field(u32, iv32)
-               __field(u16, iv16)
+               KEY_ENTRY
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               __entry->hw_key_idx = hw_key_idx;
-               __entry->iv32 = *iv32;
-               __entry->iv16 = *iv16;
+               KEY_ASSIGN(key);
        ),
 
        TP_printk(
-               LOCAL_PR_FMT, LOCAL_PR_ARG
+               LOCAL_PR_FMT KEY_PR_FMT,
+               LOCAL_PR_ARG, KEY_PR_ARG
        )
 );
 
@@ -942,9 +972,9 @@ TRACE_EVENT(drv_ampdu_action,
                 struct ieee80211_sub_if_data *sdata,
                 enum ieee80211_ampdu_mlme_action action,
                 struct ieee80211_sta *sta, u16 tid,
-                u16 *ssn, u8 buf_size),
+                u16 *ssn, u8 buf_size, bool amsdu),
 
-       TP_ARGS(local, sdata, action, sta, tid, ssn, buf_size),
+       TP_ARGS(local, sdata, action, sta, tid, ssn, buf_size, amsdu),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
@@ -953,6 +983,7 @@ TRACE_EVENT(drv_ampdu_action,
                __field(u16, tid)
                __field(u16, ssn)
                __field(u8, buf_size)
+               __field(bool, amsdu)
                VIF_ENTRY
        ),
 
@@ -964,12 +995,13 @@ TRACE_EVENT(drv_ampdu_action,
                __entry->tid = tid;
                __entry->ssn = ssn ? *ssn : 0;
                __entry->buf_size = buf_size;
+               __entry->amsdu = amsdu;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d buf:%d",
+               LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d buf:%d amsdu:%d",
                LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action,
-               __entry->tid, __entry->buf_size
+               __entry->tid, __entry->buf_size, __entry->amsdu
        )
 );