wifi: mac80211: sort trace.h file
authorJohannes Berg <johannes.berg@intel.com>
Tue, 31 May 2022 21:06:19 +0000 (23:06 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 20 Jun 2022 10:55:35 +0000 (12:55 +0200)
This used to be sorted by driver methods, APIs and internal
functions, but got added to in the wrong sections. Fix that
by ordering the file properly again.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/trace.h

index f14baf64fda09dd8845a0475166623438ac39118..295db57a76a27c8d35a4daaebf9f030f7733f0bd 100644 (file)
@@ -2018,933 +2018,933 @@ DEFINE_EVENT(local_sdata_evt, drv_abort_pmsr,
        TP_ARGS(local, sdata)
 );
 
-/*
- * Tracing for API calls that drivers call.
- */
-
-TRACE_EVENT(api_start_tx_ba_session,
-       TP_PROTO(struct ieee80211_sta *sta, u16 tid),
+TRACE_EVENT(drv_set_default_unicast_key,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                int key_idx),
 
-       TP_ARGS(sta, tid),
+       TP_ARGS(local, sdata, key_idx),
 
        TP_STRUCT__entry(
-               STA_ENTRY
-               __field(u16, tid)
+               LOCAL_ENTRY
+               VIF_ENTRY
+               __field(int, key_idx)
        ),
 
        TP_fast_assign(
-               STA_ASSIGN;
-               __entry->tid = tid;
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               __entry->key_idx = key_idx;
        ),
 
-       TP_printk(
-               STA_PR_FMT " tid:%d",
-               STA_PR_ARG, __entry->tid
-       )
+       TP_printk(LOCAL_PR_FMT VIF_PR_FMT " key_idx:%d",
+                 LOCAL_PR_ARG, VIF_PR_ARG, __entry->key_idx)
 );
 
-TRACE_EVENT(api_start_tx_ba_cb,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata, const u8 *ra, u16 tid),
+TRACE_EVENT(drv_channel_switch_beacon,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct cfg80211_chan_def *chandef),
 
-       TP_ARGS(sdata, ra, tid),
+       TP_ARGS(local, sdata, chandef),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
-               __array(u8, ra, ETH_ALEN)
-               __field(u16, tid)
+               CHANDEF_ENTRY
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               memcpy(__entry->ra, ra, ETH_ALEN);
-               __entry->tid = tid;
+               CHANDEF_ASSIGN(chandef);
        ),
 
        TP_printk(
-               VIF_PR_FMT " ra:%pM tid:%d",
-               VIF_PR_ARG, __entry->ra, __entry->tid
+               LOCAL_PR_FMT VIF_PR_FMT " channel switch to " CHANDEF_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG
        )
 );
 
-TRACE_EVENT(api_stop_tx_ba_session,
-       TP_PROTO(struct ieee80211_sta *sta, u16 tid),
+TRACE_EVENT(drv_pre_channel_switch,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_channel_switch *ch_switch),
 
-       TP_ARGS(sta, tid),
+       TP_ARGS(local, sdata, ch_switch),
 
        TP_STRUCT__entry(
-               STA_ENTRY
-               __field(u16, tid)
+               LOCAL_ENTRY
+               VIF_ENTRY
+               CHANDEF_ENTRY
+               __field(u64, timestamp)
+               __field(u32, device_timestamp)
+               __field(bool, block_tx)
+               __field(u8, count)
        ),
 
        TP_fast_assign(
-               STA_ASSIGN;
-               __entry->tid = tid;
+               LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               CHANDEF_ASSIGN(&ch_switch->chandef)
+               __entry->timestamp = ch_switch->timestamp;
+               __entry->device_timestamp = ch_switch->device_timestamp;
+               __entry->block_tx = ch_switch->block_tx;
+               __entry->count = ch_switch->count;
        ),
 
        TP_printk(
-               STA_PR_FMT " tid:%d",
-               STA_PR_ARG, __entry->tid
+               LOCAL_PR_FMT VIF_PR_FMT " prepare channel switch to "
+               CHANDEF_PR_FMT  " count:%d block_tx:%d timestamp:%llu",
+               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->count,
+               __entry->block_tx, __entry->timestamp
        )
 );
 
-TRACE_EVENT(api_stop_tx_ba_cb,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata, const u8 *ra, u16 tid),
+DEFINE_EVENT(local_sdata_evt, drv_post_channel_switch,
+            TP_PROTO(struct ieee80211_local *local,
+                     struct ieee80211_sub_if_data *sdata),
+            TP_ARGS(local, sdata)
+);
 
-       TP_ARGS(sdata, ra, tid),
+DEFINE_EVENT(local_sdata_evt, drv_abort_channel_switch,
+            TP_PROTO(struct ieee80211_local *local,
+                     struct ieee80211_sub_if_data *sdata),
+            TP_ARGS(local, sdata)
+);
+
+TRACE_EVENT(drv_channel_switch_rx_beacon,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_channel_switch *ch_switch),
+
+       TP_ARGS(local, sdata, ch_switch),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
-               __array(u8, ra, ETH_ALEN)
-               __field(u16, tid)
+               CHANDEF_ENTRY
+               __field(u64, timestamp)
+               __field(u32, device_timestamp)
+               __field(bool, block_tx)
+               __field(u8, count)
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               memcpy(__entry->ra, ra, ETH_ALEN);
-               __entry->tid = tid;
+               CHANDEF_ASSIGN(&ch_switch->chandef)
+               __entry->timestamp = ch_switch->timestamp;
+               __entry->device_timestamp = ch_switch->device_timestamp;
+               __entry->block_tx = ch_switch->block_tx;
+               __entry->count = ch_switch->count;
        ),
 
        TP_printk(
-               VIF_PR_FMT " ra:%pM tid:%d",
-               VIF_PR_ARG, __entry->ra, __entry->tid
+               LOCAL_PR_FMT VIF_PR_FMT
+               " received a channel switch beacon to "
+               CHANDEF_PR_FMT  " count:%d block_tx:%d timestamp:%llu",
+               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->count,
+               __entry->block_tx, __entry->timestamp
        )
 );
 
-DEFINE_EVENT(local_only_evt, api_restart_hw,
-       TP_PROTO(struct ieee80211_local *local),
-       TP_ARGS(local)
-);
-
-TRACE_EVENT(api_beacon_loss,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata),
+TRACE_EVENT(drv_get_txpower,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                int dbm, int ret),
 
-       TP_ARGS(sdata),
+       TP_ARGS(local, sdata, dbm, ret),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
+               __field(int, dbm)
+               __field(int, ret)
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
+               __entry->dbm = dbm;
+               __entry->ret = ret;
        ),
 
        TP_printk(
-               VIF_PR_FMT,
-               VIF_PR_ARG
+               LOCAL_PR_FMT VIF_PR_FMT " dbm:%d ret:%d",
+               LOCAL_PR_ARG, VIF_PR_ARG, __entry->dbm, __entry->ret
        )
 );
 
-TRACE_EVENT(api_connection_loss,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata),
+TRACE_EVENT(drv_tdls_channel_switch,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta, u8 oper_class,
+                struct cfg80211_chan_def *chandef),
 
-       TP_ARGS(sdata),
+       TP_ARGS(local, sdata, sta, oper_class, chandef),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
+               STA_ENTRY
+               __field(u8, oper_class)
+               CHANDEF_ENTRY
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->oper_class = oper_class;
+               CHANDEF_ASSIGN(chandef)
        ),
 
        TP_printk(
-               VIF_PR_FMT,
-               VIF_PR_ARG
+               LOCAL_PR_FMT VIF_PR_FMT " tdls channel switch to"
+               CHANDEF_PR_FMT  " oper_class:%d " STA_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->oper_class,
+               STA_PR_ARG
        )
 );
 
-TRACE_EVENT(api_disconnect,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata, bool reconnect),
+TRACE_EVENT(drv_tdls_cancel_channel_switch,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta),
 
-       TP_ARGS(sdata, reconnect),
+       TP_ARGS(local, sdata, sta),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
-               __field(int, reconnect)
+               STA_ENTRY
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               __entry->reconnect = reconnect;
+               STA_ASSIGN;
        ),
 
        TP_printk(
-               VIF_PR_FMT " reconnect:%d",
-               VIF_PR_ARG, __entry->reconnect
+               LOCAL_PR_FMT VIF_PR_FMT
+               " tdls cancel channel switch with " STA_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG
        )
 );
 
-TRACE_EVENT(api_cqm_rssi_notify,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata,
-                enum nl80211_cqm_rssi_threshold_event rssi_event,
-                s32 rssi_level),
+TRACE_EVENT(drv_tdls_recv_channel_switch,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_tdls_ch_sw_params *params),
 
-       TP_ARGS(sdata, rssi_event, rssi_level),
+       TP_ARGS(local, sdata, params),
 
        TP_STRUCT__entry(
+               LOCAL_ENTRY
                VIF_ENTRY
-               __field(u32, rssi_event)
-               __field(s32, rssi_level)
+               __field(u8, action_code)
+               STA_ENTRY
+               CHANDEF_ENTRY
+               __field(u32, status)
+               __field(bool, peer_initiator)
+               __field(u32, timestamp)
+               __field(u16, switch_time)
+               __field(u16, switch_timeout)
        ),
 
        TP_fast_assign(
+               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               __entry->rssi_event = rssi_event;
-               __entry->rssi_level = rssi_level;
+               STA_NAMED_ASSIGN(params->sta);
+               CHANDEF_ASSIGN(params->chandef)
+               __entry->peer_initiator = params->sta->tdls_initiator;
+               __entry->action_code = params->action_code;
+               __entry->status = params->status;
+               __entry->timestamp = params->timestamp;
+               __entry->switch_time = params->switch_time;
+               __entry->switch_timeout = params->switch_timeout;
        ),
 
        TP_printk(
-               VIF_PR_FMT " event:%d rssi:%d",
-               VIF_PR_ARG, __entry->rssi_event, __entry->rssi_level
+               LOCAL_PR_FMT VIF_PR_FMT " received tdls channel switch packet"
+               " action:%d status:%d time:%d switch time:%d switch"
+               " timeout:%d initiator: %d chan:" CHANDEF_PR_FMT STA_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG, __entry->action_code, __entry->status,
+               __entry->timestamp, __entry->switch_time,
+               __entry->switch_timeout, __entry->peer_initiator,
+               CHANDEF_PR_ARG, STA_PR_ARG
        )
 );
 
-DEFINE_EVENT(local_sdata_evt, api_cqm_beacon_loss_notify,
+TRACE_EVENT(drv_wake_tx_queue,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata),
-       TP_ARGS(local, sdata)
-);
-
-TRACE_EVENT(api_scan_completed,
-       TP_PROTO(struct ieee80211_local *local, bool aborted),
+                struct ieee80211_sub_if_data *sdata,
+                struct txq_info *txq),
 
-       TP_ARGS(local, aborted),
+       TP_ARGS(local, sdata, txq),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               __field(bool, aborted)
+               VIF_ENTRY
+               STA_ENTRY
+               __field(u8, ac)
+               __field(u8, tid)
        ),
 
        TP_fast_assign(
+               struct ieee80211_sta *sta = txq->txq.sta;
+
                LOCAL_ASSIGN;
-               __entry->aborted = aborted;
+               VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->ac = txq->txq.ac;
+               __entry->tid = txq->txq.tid;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " aborted:%d",
-               LOCAL_PR_ARG, __entry->aborted
+               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ac:%d tid:%d",
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid
        )
 );
 
-TRACE_EVENT(api_sched_scan_results,
-       TP_PROTO(struct ieee80211_local *local),
+TRACE_EVENT(drv_get_ftm_responder_stats,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct cfg80211_ftm_responder_stats *ftm_stats),
 
-       TP_ARGS(local),
+       TP_ARGS(local, sdata, ftm_stats),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
+               VIF_ENTRY
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
+               VIF_ASSIGN;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT, LOCAL_PR_ARG
+               LOCAL_PR_FMT VIF_PR_FMT,
+               LOCAL_PR_ARG, VIF_PR_ARG
        )
 );
 
-TRACE_EVENT(api_sched_scan_stopped,
-       TP_PROTO(struct ieee80211_local *local),
+DEFINE_EVENT(local_sdata_addr_evt, drv_update_vif_offload,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata),
+       TP_ARGS(local, sdata)
+);
 
-       TP_ARGS(local),
+DECLARE_EVENT_CLASS(sta_flag_evt,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta, bool enabled),
+
+       TP_ARGS(local, sdata, sta, enabled),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
+               VIF_ENTRY
+               STA_ENTRY
+               __field(bool, enabled)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
+               VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->enabled = enabled;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT, LOCAL_PR_ARG
+               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " enabled:%d",
+               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->enabled
        )
 );
 
-TRACE_EVENT(api_sta_block_awake,
+DEFINE_EVENT(sta_flag_evt, drv_sta_set_4addr,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta, bool block),
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta, bool enabled),
 
-       TP_ARGS(local, sta, block),
+       TP_ARGS(local, sdata, sta, enabled)
+);
+
+DEFINE_EVENT(sta_flag_evt, drv_sta_set_decap_offload,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta, bool enabled),
+
+       TP_ARGS(local, sdata, sta, enabled)
+);
+
+TRACE_EVENT(drv_add_twt_setup,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sta *sta,
+                struct ieee80211_twt_setup *twt,
+                struct ieee80211_twt_params *twt_agrt),
+
+       TP_ARGS(local, sta, twt, twt_agrt),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
                STA_ENTRY
-               __field(bool, block)
+               __field(u8, dialog_token)
+               __field(u8, control)
+               __field(__le16, req_type)
+               __field(__le64, twt)
+               __field(u8, duration)
+               __field(__le16, mantissa)
+               __field(u8, channel)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
                STA_ASSIGN;
-               __entry->block = block;
+               __entry->dialog_token = twt->dialog_token;
+               __entry->control = twt->control;
+               __entry->req_type = twt_agrt->req_type;
+               __entry->twt = twt_agrt->twt;
+               __entry->duration = twt_agrt->min_twt_dur;
+               __entry->mantissa = twt_agrt->mantissa;
+               __entry->channel = twt_agrt->channel;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT " block:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->block
+               LOCAL_PR_FMT STA_PR_FMT
+               " token:%d control:0x%02x req_type:0x%04x"
+               " twt:%llu duration:%d mantissa:%d channel:%d",
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->dialog_token,
+               __entry->control, le16_to_cpu(__entry->req_type),
+               le64_to_cpu(__entry->twt), __entry->duration,
+               le16_to_cpu(__entry->mantissa), __entry->channel
        )
 );
 
-TRACE_EVENT(api_chswitch_done,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata, bool success),
+TRACE_EVENT(drv_twt_teardown_request,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sta *sta, u8 flowid),
 
-       TP_ARGS(sdata, success),
+       TP_ARGS(local, sta, flowid),
 
        TP_STRUCT__entry(
-               VIF_ENTRY
-               __field(bool, success)
+               LOCAL_ENTRY
+               STA_ENTRY
+               __field(u8, flowid)
        ),
 
        TP_fast_assign(
-               VIF_ASSIGN;
-               __entry->success = success;
+               LOCAL_ASSIGN;
+               STA_ASSIGN;
+               __entry->flowid = flowid;
        ),
 
        TP_printk(
-               VIF_PR_FMT " success=%d",
-               VIF_PR_ARG, __entry->success
+               LOCAL_PR_FMT STA_PR_FMT " flowid:%d",
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->flowid
        )
 );
 
-DEFINE_EVENT(local_only_evt, api_ready_on_channel,
-       TP_PROTO(struct ieee80211_local *local),
-       TP_ARGS(local)
+DEFINE_EVENT(sta_event, drv_net_fill_forward_path,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata,
+                struct ieee80211_sta *sta),
+       TP_ARGS(local, sdata, sta)
 );
 
-DEFINE_EVENT(local_only_evt, api_remain_on_channel_expired,
-       TP_PROTO(struct ieee80211_local *local),
-       TP_ARGS(local)
-);
+/*
+ * Tracing for API calls that drivers call.
+ */
 
-TRACE_EVENT(api_gtk_rekey_notify,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata,
-                const u8 *bssid, const u8 *replay_ctr),
+TRACE_EVENT(api_start_tx_ba_session,
+       TP_PROTO(struct ieee80211_sta *sta, u16 tid),
 
-       TP_ARGS(sdata, bssid, replay_ctr),
+       TP_ARGS(sta, tid),
 
        TP_STRUCT__entry(
-               VIF_ENTRY
-               __array(u8, bssid, ETH_ALEN)
-               __array(u8, replay_ctr, NL80211_REPLAY_CTR_LEN)
+               STA_ENTRY
+               __field(u16, tid)
        ),
 
        TP_fast_assign(
-               VIF_ASSIGN;
-               memcpy(__entry->bssid, bssid, ETH_ALEN);
-               memcpy(__entry->replay_ctr, replay_ctr, NL80211_REPLAY_CTR_LEN);
+               STA_ASSIGN;
+               __entry->tid = tid;
        ),
 
-       TP_printk(VIF_PR_FMT, VIF_PR_ARG)
+       TP_printk(
+               STA_PR_FMT " tid:%d",
+               STA_PR_ARG, __entry->tid
+       )
 );
 
-TRACE_EVENT(api_enable_rssi_reports,
-       TP_PROTO(struct ieee80211_sub_if_data *sdata,
-                int rssi_min_thold, int rssi_max_thold),
+TRACE_EVENT(api_start_tx_ba_cb,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata, const u8 *ra, u16 tid),
 
-       TP_ARGS(sdata, rssi_min_thold, rssi_max_thold),
+       TP_ARGS(sdata, ra, tid),
 
        TP_STRUCT__entry(
                VIF_ENTRY
-               __field(int, rssi_min_thold)
-               __field(int, rssi_max_thold)
+               __array(u8, ra, ETH_ALEN)
+               __field(u16, tid)
        ),
 
        TP_fast_assign(
                VIF_ASSIGN;
-               __entry->rssi_min_thold = rssi_min_thold;
-               __entry->rssi_max_thold = rssi_max_thold;
+               memcpy(__entry->ra, ra, ETH_ALEN);
+               __entry->tid = tid;
        ),
 
        TP_printk(
-               VIF_PR_FMT " rssi_min_thold =%d, rssi_max_thold = %d",
-               VIF_PR_ARG, __entry->rssi_min_thold, __entry->rssi_max_thold
+               VIF_PR_FMT " ra:%pM tid:%d",
+               VIF_PR_ARG, __entry->ra, __entry->tid
        )
 );
 
-TRACE_EVENT(api_eosp,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta),
+TRACE_EVENT(api_stop_tx_ba_session,
+       TP_PROTO(struct ieee80211_sta *sta, u16 tid),
 
-       TP_ARGS(local, sta),
+       TP_ARGS(sta, tid),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
                STA_ENTRY
+               __field(u16, tid)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
                STA_ASSIGN;
+               __entry->tid = tid;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT,
-               LOCAL_PR_ARG, STA_PR_ARG
+               STA_PR_FMT " tid:%d",
+               STA_PR_ARG, __entry->tid
        )
 );
 
-TRACE_EVENT(api_send_eosp_nullfunc,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta,
-                u8 tid),
+TRACE_EVENT(api_stop_tx_ba_cb,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata, const u8 *ra, u16 tid),
 
-       TP_ARGS(local, sta, tid),
+       TP_ARGS(sdata, ra, tid),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
-               STA_ENTRY
-               __field(u8, tid)
+               VIF_ENTRY
+               __array(u8, ra, ETH_ALEN)
+               __field(u16, tid)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
-               STA_ASSIGN;
+               VIF_ASSIGN;
+               memcpy(__entry->ra, ra, ETH_ALEN);
                __entry->tid = tid;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT " tid:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->tid
+               VIF_PR_FMT " ra:%pM tid:%d",
+               VIF_PR_ARG, __entry->ra, __entry->tid
        )
 );
 
-TRACE_EVENT(api_sta_set_buffered,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta,
-                u8 tid, bool buffered),
+DEFINE_EVENT(local_only_evt, api_restart_hw,
+       TP_PROTO(struct ieee80211_local *local),
+       TP_ARGS(local)
+);
 
-       TP_ARGS(local, sta, tid, buffered),
+TRACE_EVENT(api_beacon_loss,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata),
+
+       TP_ARGS(sdata),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
-               STA_ENTRY
-               __field(u8, tid)
-               __field(bool, buffered)
+               VIF_ENTRY
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
-               STA_ASSIGN;
-               __entry->tid = tid;
-               __entry->buffered = buffered;
+               VIF_ASSIGN;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT " tid:%d buffered:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->tid, __entry->buffered
+               VIF_PR_FMT,
+               VIF_PR_ARG
        )
 );
 
-/*
- * Tracing for internal functions
- * (which may also be called in response to driver calls)
- */
-
-TRACE_EVENT(wake_queue,
-       TP_PROTO(struct ieee80211_local *local, u16 queue,
-                enum queue_stop_reason reason),
+TRACE_EVENT(api_connection_loss,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata),
 
-       TP_ARGS(local, queue, reason),
+       TP_ARGS(sdata),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
-               __field(u16, queue)
-               __field(u32, reason)
+               VIF_ENTRY
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
-               __entry->queue = queue;
-               __entry->reason = reason;
+               VIF_ASSIGN;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " queue:%d, reason:%d",
-               LOCAL_PR_ARG, __entry->queue, __entry->reason
+               VIF_PR_FMT,
+               VIF_PR_ARG
        )
 );
 
-TRACE_EVENT(stop_queue,
-       TP_PROTO(struct ieee80211_local *local, u16 queue,
-                enum queue_stop_reason reason),
+TRACE_EVENT(api_disconnect,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata, bool reconnect),
 
-       TP_ARGS(local, queue, reason),
+       TP_ARGS(sdata, reconnect),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
-               __field(u16, queue)
-               __field(u32, reason)
+               VIF_ENTRY
+               __field(int, reconnect)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
-               __entry->queue = queue;
-               __entry->reason = reason;
+               VIF_ASSIGN;
+               __entry->reconnect = reconnect;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " queue:%d, reason:%d",
-               LOCAL_PR_ARG, __entry->queue, __entry->reason
+               VIF_PR_FMT " reconnect:%d",
+               VIF_PR_ARG, __entry->reconnect
        )
 );
 
-TRACE_EVENT(drv_set_default_unicast_key,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                int key_idx),
+TRACE_EVENT(api_cqm_rssi_notify,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata,
+                enum nl80211_cqm_rssi_threshold_event rssi_event,
+                s32 rssi_level),
 
-       TP_ARGS(local, sdata, key_idx),
+       TP_ARGS(sdata, rssi_event, rssi_level),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
                VIF_ENTRY
-               __field(int, key_idx)
+               __field(u32, rssi_event)
+               __field(s32, rssi_level)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               __entry->key_idx = key_idx;
+               __entry->rssi_event = rssi_event;
+               __entry->rssi_level = rssi_level;
        ),
 
-       TP_printk(LOCAL_PR_FMT VIF_PR_FMT " key_idx:%d",
-                 LOCAL_PR_ARG, VIF_PR_ARG, __entry->key_idx)
+       TP_printk(
+               VIF_PR_FMT " event:%d rssi:%d",
+               VIF_PR_ARG, __entry->rssi_event, __entry->rssi_level
+       )
 );
 
-TRACE_EVENT(api_radar_detected,
-       TP_PROTO(struct ieee80211_local *local),
+DEFINE_EVENT(local_sdata_evt, api_cqm_beacon_loss_notify,
+       TP_PROTO(struct ieee80211_local *local,
+                struct ieee80211_sub_if_data *sdata),
+       TP_ARGS(local, sdata)
+);
 
-       TP_ARGS(local),
+TRACE_EVENT(api_scan_completed,
+       TP_PROTO(struct ieee80211_local *local, bool aborted),
+
+       TP_ARGS(local, aborted),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
+               __field(bool, aborted)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
+               __entry->aborted = aborted;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT " radar detected",
-               LOCAL_PR_ARG
+               LOCAL_PR_FMT " aborted:%d",
+               LOCAL_PR_ARG, __entry->aborted
        )
 );
 
-TRACE_EVENT(drv_channel_switch_beacon,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct cfg80211_chan_def *chandef),
+TRACE_EVENT(api_sched_scan_results,
+       TP_PROTO(struct ieee80211_local *local),
 
-       TP_ARGS(local, sdata, chandef),
+       TP_ARGS(local),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
-               CHANDEF_ENTRY
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
-               CHANDEF_ASSIGN(chandef);
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT " channel switch to " CHANDEF_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG
+               LOCAL_PR_FMT, LOCAL_PR_ARG
        )
 );
 
-TRACE_EVENT(drv_pre_channel_switch,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_channel_switch *ch_switch),
+TRACE_EVENT(api_sched_scan_stopped,
+       TP_PROTO(struct ieee80211_local *local),
 
-       TP_ARGS(local, sdata, ch_switch),
+       TP_ARGS(local),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
-               CHANDEF_ENTRY
-               __field(u64, timestamp)
-               __field(u32, device_timestamp)
-               __field(bool, block_tx)
-               __field(u8, count)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
-               CHANDEF_ASSIGN(&ch_switch->chandef)
-               __entry->timestamp = ch_switch->timestamp;
-               __entry->device_timestamp = ch_switch->device_timestamp;
-               __entry->block_tx = ch_switch->block_tx;
-               __entry->count = ch_switch->count;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT " prepare channel switch to "
-               CHANDEF_PR_FMT  " count:%d block_tx:%d timestamp:%llu",
-               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->count,
-               __entry->block_tx, __entry->timestamp
+               LOCAL_PR_FMT, LOCAL_PR_ARG
        )
 );
 
-DEFINE_EVENT(local_sdata_evt, drv_post_channel_switch,
-            TP_PROTO(struct ieee80211_local *local,
-                     struct ieee80211_sub_if_data *sdata),
-            TP_ARGS(local, sdata)
-);
-
-DEFINE_EVENT(local_sdata_evt, drv_abort_channel_switch,
-            TP_PROTO(struct ieee80211_local *local,
-                     struct ieee80211_sub_if_data *sdata),
-            TP_ARGS(local, sdata)
-);
-
-TRACE_EVENT(drv_channel_switch_rx_beacon,
+TRACE_EVENT(api_sta_block_awake,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_channel_switch *ch_switch),
+                struct ieee80211_sta *sta, bool block),
 
-       TP_ARGS(local, sdata, ch_switch),
+       TP_ARGS(local, sta, block),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
-               CHANDEF_ENTRY
-               __field(u64, timestamp)
-               __field(u32, device_timestamp)
-               __field(bool, block_tx)
-               __field(u8, count)
+               STA_ENTRY
+               __field(bool, block)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
-               CHANDEF_ASSIGN(&ch_switch->chandef)
-               __entry->timestamp = ch_switch->timestamp;
-               __entry->device_timestamp = ch_switch->device_timestamp;
-               __entry->block_tx = ch_switch->block_tx;
-               __entry->count = ch_switch->count;
+               STA_ASSIGN;
+               __entry->block = block;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT
-               " received a channel switch beacon to "
-               CHANDEF_PR_FMT  " count:%d block_tx:%d timestamp:%llu",
-               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->count,
-               __entry->block_tx, __entry->timestamp
+               LOCAL_PR_FMT STA_PR_FMT " block:%d",
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->block
        )
 );
 
-TRACE_EVENT(drv_get_txpower,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                int dbm, int ret),
+TRACE_EVENT(api_chswitch_done,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata, bool success),
 
-       TP_ARGS(local, sdata, dbm, ret),
+       TP_ARGS(sdata, success),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
                VIF_ENTRY
-               __field(int, dbm)
-               __field(int, ret)
+               __field(bool, success)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               __entry->dbm = dbm;
-               __entry->ret = ret;
+               __entry->success = success;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT " dbm:%d ret:%d",
-               LOCAL_PR_ARG, VIF_PR_ARG, __entry->dbm, __entry->ret
+               VIF_PR_FMT " success=%d",
+               VIF_PR_ARG, __entry->success
        )
 );
 
-TRACE_EVENT(drv_tdls_channel_switch,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta, u8 oper_class,
-                struct cfg80211_chan_def *chandef),
+DEFINE_EVENT(local_only_evt, api_ready_on_channel,
+       TP_PROTO(struct ieee80211_local *local),
+       TP_ARGS(local)
+);
 
-       TP_ARGS(local, sdata, sta, oper_class, chandef),
+DEFINE_EVENT(local_only_evt, api_remain_on_channel_expired,
+       TP_PROTO(struct ieee80211_local *local),
+       TP_ARGS(local)
+);
+
+TRACE_EVENT(api_gtk_rekey_notify,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata,
+                const u8 *bssid, const u8 *replay_ctr),
+
+       TP_ARGS(sdata, bssid, replay_ctr),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
                VIF_ENTRY
-               STA_ENTRY
-               __field(u8, oper_class)
-               CHANDEF_ENTRY
+               __array(u8, bssid, ETH_ALEN)
+               __array(u8, replay_ctr, NL80211_REPLAY_CTR_LEN)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               STA_ASSIGN;
-               __entry->oper_class = oper_class;
-               CHANDEF_ASSIGN(chandef)
+               memcpy(__entry->bssid, bssid, ETH_ALEN);
+               memcpy(__entry->replay_ctr, replay_ctr, NL80211_REPLAY_CTR_LEN);
        ),
 
-       TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT " tdls channel switch to"
-               CHANDEF_PR_FMT  " oper_class:%d " STA_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG, CHANDEF_PR_ARG, __entry->oper_class,
-               STA_PR_ARG
-       )
+       TP_printk(VIF_PR_FMT, VIF_PR_ARG)
 );
 
-TRACE_EVENT(drv_tdls_cancel_channel_switch,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta),
+TRACE_EVENT(api_enable_rssi_reports,
+       TP_PROTO(struct ieee80211_sub_if_data *sdata,
+                int rssi_min_thold, int rssi_max_thold),
 
-       TP_ARGS(local, sdata, sta),
+       TP_ARGS(sdata, rssi_min_thold, rssi_max_thold),
 
        TP_STRUCT__entry(
-               LOCAL_ENTRY
                VIF_ENTRY
-               STA_ENTRY
+               __field(int, rssi_min_thold)
+               __field(int, rssi_max_thold)
        ),
 
        TP_fast_assign(
-               LOCAL_ASSIGN;
                VIF_ASSIGN;
-               STA_ASSIGN;
+               __entry->rssi_min_thold = rssi_min_thold;
+               __entry->rssi_max_thold = rssi_max_thold;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT
-               " tdls cancel channel switch with " STA_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG
+               VIF_PR_FMT " rssi_min_thold =%d, rssi_max_thold = %d",
+               VIF_PR_ARG, __entry->rssi_min_thold, __entry->rssi_max_thold
        )
 );
 
-TRACE_EVENT(drv_tdls_recv_channel_switch,
+TRACE_EVENT(api_eosp,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_tdls_ch_sw_params *params),
+                struct ieee80211_sta *sta),
 
-       TP_ARGS(local, sdata, params),
+       TP_ARGS(local, sta),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
-               __field(u8, action_code)
                STA_ENTRY
-               CHANDEF_ENTRY
-               __field(u32, status)
-               __field(bool, peer_initiator)
-               __field(u32, timestamp)
-               __field(u16, switch_time)
-               __field(u16, switch_timeout)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
-               STA_NAMED_ASSIGN(params->sta);
-               CHANDEF_ASSIGN(params->chandef)
-               __entry->peer_initiator = params->sta->tdls_initiator;
-               __entry->action_code = params->action_code;
-               __entry->status = params->status;
-               __entry->timestamp = params->timestamp;
-               __entry->switch_time = params->switch_time;
-               __entry->switch_timeout = params->switch_timeout;
+               STA_ASSIGN;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT " received tdls channel switch packet"
-               " action:%d status:%d time:%d switch time:%d switch"
-               " timeout:%d initiator: %d chan:" CHANDEF_PR_FMT STA_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG, __entry->action_code, __entry->status,
-               __entry->timestamp, __entry->switch_time,
-               __entry->switch_timeout, __entry->peer_initiator,
-               CHANDEF_PR_ARG, STA_PR_ARG
+               LOCAL_PR_FMT STA_PR_FMT,
+               LOCAL_PR_ARG, STA_PR_ARG
        )
 );
 
-TRACE_EVENT(drv_wake_tx_queue,
+TRACE_EVENT(api_send_eosp_nullfunc,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct txq_info *txq),
+                struct ieee80211_sta *sta,
+                u8 tid),
 
-       TP_ARGS(local, sdata, txq),
+       TP_ARGS(local, sta, tid),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
                STA_ENTRY
-               __field(u8, ac)
                __field(u8, tid)
        ),
 
        TP_fast_assign(
-               struct ieee80211_sta *sta = txq->txq.sta;
-
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
                STA_ASSIGN;
-               __entry->ac = txq->txq.ac;
-               __entry->tid = txq->txq.tid;
+               __entry->tid = tid;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " ac:%d tid:%d",
-               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ac, __entry->tid
+               LOCAL_PR_FMT STA_PR_FMT " tid:%d",
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->tid
        )
 );
 
-TRACE_EVENT(drv_get_ftm_responder_stats,
+TRACE_EVENT(api_sta_set_buffered,
        TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct cfg80211_ftm_responder_stats *ftm_stats),
+                struct ieee80211_sta *sta,
+                u8 tid, bool buffered),
 
-       TP_ARGS(local, sdata, ftm_stats),
+       TP_ARGS(local, sta, tid, buffered),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
+               STA_ENTRY
+               __field(u8, tid)
+               __field(bool, buffered)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
+               STA_ASSIGN;
+               __entry->tid = tid;
+               __entry->buffered = buffered;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT VIF_PR_FMT,
-               LOCAL_PR_ARG, VIF_PR_ARG
+               LOCAL_PR_FMT STA_PR_FMT " tid:%d buffered:%d",
+               LOCAL_PR_ARG, STA_PR_ARG, __entry->tid, __entry->buffered
        )
 );
 
-DEFINE_EVENT(local_sdata_addr_evt, drv_update_vif_offload,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata),
-       TP_ARGS(local, sdata)
-);
-
-DECLARE_EVENT_CLASS(sta_flag_evt,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta, bool enabled),
+TRACE_EVENT(api_radar_detected,
+       TP_PROTO(struct ieee80211_local *local),
 
-       TP_ARGS(local, sdata, sta, enabled),
+       TP_ARGS(local),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               VIF_ENTRY
-               STA_ENTRY
-               __field(bool, enabled)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               VIF_ASSIGN;
-               STA_ASSIGN;
-               __entry->enabled = enabled;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " enabled:%d",
-               LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->enabled
+               LOCAL_PR_FMT " radar detected",
+               LOCAL_PR_ARG
        )
 );
 
-DEFINE_EVENT(sta_flag_evt, drv_sta_set_4addr,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta, bool enabled),
-
-       TP_ARGS(local, sdata, sta, enabled)
-);
-
-DEFINE_EVENT(sta_flag_evt, drv_sta_set_decap_offload,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta, bool enabled),
-
-       TP_ARGS(local, sdata, sta, enabled)
-);
+/*
+ * Tracing for internal functions
+ * (which may also be called in response to driver calls)
+ */
 
-TRACE_EVENT(drv_add_twt_setup,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta,
-                struct ieee80211_twt_setup *twt,
-                struct ieee80211_twt_params *twt_agrt),
+TRACE_EVENT(wake_queue,
+       TP_PROTO(struct ieee80211_local *local, u16 queue,
+                enum queue_stop_reason reason),
 
-       TP_ARGS(local, sta, twt, twt_agrt),
+       TP_ARGS(local, queue, reason),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               STA_ENTRY
-               __field(u8, dialog_token)
-               __field(u8, control)
-               __field(__le16, req_type)
-               __field(__le64, twt)
-               __field(u8, duration)
-               __field(__le16, mantissa)
-               __field(u8, channel)
+               __field(u16, queue)
+               __field(u32, reason)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               STA_ASSIGN;
-               __entry->dialog_token = twt->dialog_token;
-               __entry->control = twt->control;
-               __entry->req_type = twt_agrt->req_type;
-               __entry->twt = twt_agrt->twt;
-               __entry->duration = twt_agrt->min_twt_dur;
-               __entry->mantissa = twt_agrt->mantissa;
-               __entry->channel = twt_agrt->channel;
+               __entry->queue = queue;
+               __entry->reason = reason;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT
-               " token:%d control:0x%02x req_type:0x%04x"
-               " twt:%llu duration:%d mantissa:%d channel:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->dialog_token,
-               __entry->control, le16_to_cpu(__entry->req_type),
-               le64_to_cpu(__entry->twt), __entry->duration,
-               le16_to_cpu(__entry->mantissa), __entry->channel
+               LOCAL_PR_FMT " queue:%d, reason:%d",
+               LOCAL_PR_ARG, __entry->queue, __entry->reason
        )
 );
 
-TRACE_EVENT(drv_twt_teardown_request,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sta *sta, u8 flowid),
+TRACE_EVENT(stop_queue,
+       TP_PROTO(struct ieee80211_local *local, u16 queue,
+                enum queue_stop_reason reason),
 
-       TP_ARGS(local, sta, flowid),
+       TP_ARGS(local, queue, reason),
 
        TP_STRUCT__entry(
                LOCAL_ENTRY
-               STA_ENTRY
-               __field(u8, flowid)
+               __field(u16, queue)
+               __field(u32, reason)
        ),
 
        TP_fast_assign(
                LOCAL_ASSIGN;
-               STA_ASSIGN;
-               __entry->flowid = flowid;
+               __entry->queue = queue;
+               __entry->reason = reason;
        ),
 
        TP_printk(
-               LOCAL_PR_FMT STA_PR_FMT " flowid:%d",
-               LOCAL_PR_ARG, STA_PR_ARG, __entry->flowid
+               LOCAL_PR_FMT " queue:%d, reason:%d",
+               LOCAL_PR_ARG, __entry->queue, __entry->reason
        )
 );
 
-DEFINE_EVENT(sta_event, drv_net_fill_forward_path,
-       TP_PROTO(struct ieee80211_local *local,
-                struct ieee80211_sub_if_data *sdata,
-                struct ieee80211_sta *sta),
-       TP_ARGS(local, sdata, sta)
-);
-
 #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
 
 #undef TRACE_INCLUDE_PATH