1 files changed, 25 insertions, 8 deletions

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index 3c1091ae6c36..72b5255cefe2 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -2642,8 +2642,9 @@ TRACE_EVENT(cfg80211_tdls_oper_request,
         );
 
 TRACE_EVENT(cfg80211_scan_done,
-        TP_PROTO(struct cfg80211_scan_request *request, bool aborted),
-        TP_ARGS(request, aborted),
+        TP_PROTO(struct cfg80211_scan_request *request,
+                 struct cfg80211_scan_info *info),
+        TP_ARGS(request, info),
         TP_STRUCT__entry(
                 __field(u32, n_channels)
                 __dynamic_array(u8, ie, request ? request->ie_len : 0)
@@ -2652,6 +2653,8 @@ TRACE_EVENT(cfg80211_scan_done,
                 MAC_ENTRY(wiphy_mac)
                 __field(bool, no_cck)
                 __field(bool, aborted)
+                __field(u64, scan_start_tsf)
+                MAC_ENTRY(tsf_bssid)
         ),
         TP_fast_assign(
                 if (request) {
@@ -2666,9 +2669,16 @@ TRACE_EVENT(cfg80211_scan_done,
                                            request->wiphy->perm_addr);
                         __entry->no_cck = request->no_cck;
                 }
-                __entry->aborted = aborted;
+                if (info) {
+                        __entry->aborted = info->aborted;
+                        __entry->scan_start_tsf = info->scan_start_tsf;
+                        MAC_ASSIGN(tsf_bssid, info->tsf_bssid);
+                }
         ),
-        TP_printk("aborted: %s", BOOL_TO_STR(__entry->aborted))
+        TP_printk("aborted: %s, scan start (TSF): %llu, tsf_bssid: " MAC_PR_FMT,
+                  BOOL_TO_STR(__entry->aborted),
+                  (unsigned long long)__entry->scan_start_tsf,
+                  MAC_PR_ARG(tsf_bssid))
 );
 
 DEFINE_EVENT(wiphy_only_evt, cfg80211_sched_scan_results,
@@ -2721,6 +2731,8 @@ TRACE_EVENT(cfg80211_inform_bss_frame,
                 __dynamic_array(u8, mgmt, len)
                 __field(s32, signal)
                 __field(u64, ts_boottime)
+                __field(u64, parent_tsf)
+                MAC_ENTRY(parent_bssid)
         ),
         TP_fast_assign(
                 WIPHY_ASSIGN;
@@ -2730,10 +2742,15 @@ TRACE_EVENT(cfg80211_inform_bss_frame,
                         memcpy(__get_dynamic_array(mgmt), mgmt, len);
                 __entry->signal = data->signal;
                 __entry->ts_boottime = data->boottime_ns;
-        ),
-        TP_printk(WIPHY_PR_FMT ", " CHAN_PR_FMT "(scan_width: %d) signal: %d, tsb:%llu",
-                  WIPHY_PR_ARG, CHAN_PR_ARG, __entry->scan_width,
-                  __entry->signal, (unsigned long long)__entry->ts_boottime)
+                __entry->parent_tsf = data->parent_tsf;
+                MAC_ASSIGN(parent_bssid, data->parent_bssid);
+        ),
+        TP_printk(WIPHY_PR_FMT ", " CHAN_PR_FMT
+                  "(scan_width: %d) signal: %d, tsb:%llu, detect_tsf:%llu, tsf_bssid: "
+                  MAC_PR_FMT, WIPHY_PR_ARG, CHAN_PR_ARG, __entry->scan_width,
+                  __entry->signal, (unsigned long long)__entry->ts_boottime,
+                  (unsigned long long)__entry->parent_tsf,
+                  MAC_PR_ARG(parent_bssid))
 );
 
 DECLARE_EVENT_CLASS(cfg80211_bss_evt,