1 files changed, 149 insertions, 146 deletions

diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index f264c20a7090..2134576f426e 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -20,29 +20,26 @@
 #define MAC_PR_FMT "%pM"
 #define MAC_PR_ARG(entry_mac) (__entry->entry_mac)
 
-#define WIPHY_ENTRY MAC_ENTRY(wiphy_mac)
-#define WIPHY_ASSIGN MAC_ASSIGN(wiphy_mac, wiphy->perm_addr)
-#define WIPHY_PR_FMT "wiphy " MAC_PR_FMT
-#define WIPHY_PR_ARG MAC_PR_ARG(wiphy_mac)
-
-#define WDEV_ENTRY __field(u32, id)
-#define WDEV_ASSIGN (__entry->id) = (wdev ? wdev->identifier : 0)
-#define WDEV_PR_FMT ", wdev id: %u"
-#define WDEV_PR_ARG (__entry->id)
-
-#define NETDEV_ENTRY __array(char, name, IFNAMSIZ) \
-                     MAC_ENTRY(netdev_addr)        \
-                     __field(int, ifindex)
+#define MAXNAME         32
+#define WIPHY_ENTRY     __array(char, wiphy_name, 32)
+#define WIPHY_ASSIGN    strlcpy(__entry->wiphy_name, wiphy_name(wiphy), MAXNAME)
+#define WIPHY_PR_FMT    "%s"
+#define WIPHY_PR_ARG    __entry->wiphy_name
+
+#define WDEV_ENTRY      __field(u32, id)
+#define WDEV_ASSIGN     (__entry->id) = (wdev ? wdev->identifier : 0)
+#define WDEV_PR_FMT     "wdev(%u)"
+#define WDEV_PR_ARG     (__entry->id)
+
+#define NETDEV_ENTRY    __array(char, name, IFNAMSIZ) \
+                        __field(int, ifindex)
 #define NETDEV_ASSIGN                                          \
         do {                                                   \
                 memcpy(__entry->name, netdev->name, IFNAMSIZ); \
-                MAC_ASSIGN(netdev_addr, netdev->dev_addr);     \
                 (__entry->ifindex) = (netdev->ifindex);        \
         } while (0)
-#define NETDEV_PR_FMT ", netdev - name: %s, addr: " MAC_PR_FMT \
-                      ", intf index: %d"
-#define NETDEV_PR_ARG (__entry->name), MAC_PR_ARG(netdev_addr), \
-                      (__entry->ifindex)
+#define NETDEV_PR_FMT   "netdev:%s(%d)"
+#define NETDEV_PR_ARG   __entry->name, __entry->ifindex
 
 #define MESH_CFG_ENTRY __field(u16, dot11MeshRetryTimeout)                 \
                        __field(u16, dot11MeshConfirmTimeout)               \
@@ -123,9 +120,37 @@
                         __entry->center_freq = 0;                 \
                 }                                                 \
         } while (0)
-#define CHAN_PR_FMT ", band: %d, freq: %u"
+#define CHAN_PR_FMT "band: %d, freq: %u"
 #define CHAN_PR_ARG __entry->band, __entry->center_freq
 
+#define CHAN_DEF_ENTRY __field(enum ieee80211_band, band)               \
+                       __field(u32, control_freq)                       \
+                       __field(u32, width)                              \
+                       __field(u32, center_freq1)                       \
+                       __field(u32, center_freq2)
+#define CHAN_DEF_ASSIGN(chandef)                                        \
+        do {                                                            \
+                if ((chandef) && (chandef)->chan) {                     \
+                        __entry->band = (chandef)->chan->band;          \
+                        __entry->control_freq =                         \
+                                (chandef)->chan->center_freq;           \
+                        __entry->width = (chandef)->width;              \
+                        __entry->center_freq1 = (chandef)->center_freq1;\
+                        __entry->center_freq2 = (chandef)->center_freq2;\
+                } else {                                                \
+                        __entry->band = 0;                              \
+                        __entry->control_freq = 0;                      \
+                        __entry->width = 0;                             \
+                        __entry->center_freq1 = 0;                      \
+                        __entry->center_freq2 = 0;                      \
+                }                                                       \
+        } while (0)
+#define CHAN_DEF_PR_FMT                                                 \
+        "band: %d, control freq: %u, width: %d, cf1: %u, cf2: %u"
+#define CHAN_DEF_PR_ARG __entry->band, __entry->control_freq,           \
+                        __entry->width, __entry->center_freq1,          \
+                        __entry->center_freq2
+
 #define SINFO_ENTRY __field(int, generation)        \
                     __field(u32, connected_time)    \
                     __field(u32, inactive_time)     \
@@ -313,7 +338,7 @@ DECLARE_EVENT_CLASS(wiphy_wdev_evt,
                 WIPHY_ASSIGN;
                 WDEV_ASSIGN;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT, WIPHY_PR_ARG, WDEV_PR_ARG)
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT, WIPHY_PR_ARG, WDEV_PR_ARG)
 );
 
 DEFINE_EVENT(wiphy_wdev_evt, rdev_return_wdev,
@@ -340,7 +365,7 @@ TRACE_EVENT(rdev_change_virtual_intf,
                 NETDEV_ASSIGN;
                 __entry->type = type;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", type: %d",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", type: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->type)
 );
 
@@ -362,7 +387,7 @@ DECLARE_EVENT_CLASS(key_handle,
                 __entry->key_index = key_index;
                 __entry->pairwise = pairwise;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", key_index: %u, pairwise: %s, mac addr: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", key_index: %u, pairwise: %s, mac addr: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->key_index,
                   BOOL_TO_STR(__entry->pairwise), MAC_PR_ARG(mac_addr))
 );
@@ -403,7 +428,7 @@ TRACE_EVENT(rdev_set_default_key,
                 __entry->unicast = unicast;
                 __entry->multicast = multicast;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", key index: %u, unicast: %s, multicast: %s",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", key index: %u, unicast: %s, multicast: %s",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->key_index,
                   BOOL_TO_STR(__entry->unicast),
                   BOOL_TO_STR(__entry->multicast))
@@ -422,7 +447,7 @@ TRACE_EVENT(rdev_set_default_mgmt_key,
                 NETDEV_ASSIGN;
                 __entry->key_index = key_index;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", key index: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", key index: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->key_index)
 );
 
@@ -433,7 +458,7 @@ TRACE_EVENT(rdev_start_ap,
         TP_STRUCT__entry(
                 WIPHY_ENTRY
                 NETDEV_ENTRY
-                CHAN_ENTRY
+                CHAN_DEF_ENTRY
                 __field(int, beacon_interval)
                 __field(int, dtim_period)
                 __array(char, ssid, IEEE80211_MAX_SSID_LEN + 1)
@@ -446,7 +471,7 @@ TRACE_EVENT(rdev_start_ap,
         TP_fast_assign(
                 WIPHY_ASSIGN;
                 NETDEV_ASSIGN;
-                CHAN_ASSIGN(settings->channel);
+                CHAN_DEF_ASSIGN(&settings->chandef);
                 __entry->beacon_interval = settings->beacon_interval;
                 __entry->dtim_period = settings->dtim_period;
                 __entry->hidden_ssid = settings->hidden_ssid;
@@ -457,11 +482,11 @@ TRACE_EVENT(rdev_start_ap,
                 memset(__entry->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);
                 memcpy(__entry->ssid, settings->ssid, settings->ssid_len);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", AP settings - ssid: %s, "
-                  CHAN_PR_FMT ", beacon interval: %d, dtim period: %d, "
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", AP settings - ssid: %s, "
+                  CHAN_DEF_PR_FMT ", beacon interval: %d, dtim period: %d, "
                   "hidden ssid: %d, wpa versions: %u, privacy: %s, "
                   "auth type: %d, inactivity timeout: %d",
-                  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->ssid, CHAN_PR_ARG,
+                  WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->ssid, CHAN_DEF_PR_ARG,
                   __entry->beacon_interval, __entry->dtim_period,
                   __entry->hidden_ssid, __entry->wpa_ver,
                   BOOL_TO_STR(__entry->privacy), __entry->auth_type,
@@ -510,7 +535,7 @@ TRACE_EVENT(rdev_change_beacon,
                                        info->probe_resp, info->probe_resp_len);
                 }
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT, WIPHY_PR_ARG, NETDEV_PR_ARG)
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT, WIPHY_PR_ARG, NETDEV_PR_ARG)
 );
 
 DECLARE_EVENT_CLASS(wiphy_netdev_evt,
@@ -524,7 +549,7 @@ DECLARE_EVENT_CLASS(wiphy_netdev_evt,
                 WIPHY_ASSIGN;
                 NETDEV_ASSIGN;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT, WIPHY_PR_ARG, NETDEV_PR_ARG)
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT, WIPHY_PR_ARG, NETDEV_PR_ARG)
 );
 
 DEFINE_EVENT(wiphy_netdev_evt, rdev_stop_ap,
@@ -602,7 +627,7 @@ DECLARE_EVENT_CLASS(station_add_change,
                         memcpy(__entry->ht_capa, params->ht_capa,
                                sizeof(struct ieee80211_ht_cap));
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", station mac: " MAC_PR_FMT
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT
                   ", station flags mask: %u, station flags set: %u, "
                   "station modify mask: %u, listen interval: %d, aid: %u, "
                   "plink action: %u, plink state: %u, uapsd queues: %u",
@@ -638,7 +663,7 @@ DECLARE_EVENT_CLASS(wiphy_netdev_mac_evt,
                 NETDEV_ASSIGN;
                 MAC_ASSIGN(sta_mac, mac);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", mac: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", mac: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac))
 );
 
@@ -678,7 +703,7 @@ TRACE_EVENT(rdev_dump_station,
                 MAC_ASSIGN(sta_mac, mac);
                 __entry->idx = idx;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", station mac: " MAC_PR_FMT ", idx: %d",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT ", idx: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac),
                   __entry->idx)
 );
@@ -716,7 +741,7 @@ DECLARE_EVENT_CLASS(mpath_evt,
                 MAC_ASSIGN(dst, dst);
                 MAC_ASSIGN(next_hop, next_hop);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", destination: " MAC_PR_FMT ", next hop: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", destination: " MAC_PR_FMT ", next hop: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(dst),
                   MAC_PR_ARG(next_hop))
 );
@@ -757,7 +782,7 @@ TRACE_EVENT(rdev_dump_mpath,
                 MAC_ASSIGN(next_hop, next_hop);
                 __entry->idx = idx;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", index: %d, destination: "
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d, destination: "
                   MAC_PR_FMT ", next hop: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->idx, MAC_PR_ARG(dst),
                   MAC_PR_ARG(next_hop))
@@ -834,7 +859,7 @@ TRACE_EVENT(rdev_update_mesh_config,
                 MESH_CFG_ASSIGN;
                 __entry->mask = mask;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", mask: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", mask: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->mask)
 );
 
@@ -853,7 +878,7 @@ TRACE_EVENT(rdev_join_mesh,
                 NETDEV_ASSIGN;
                 MESH_CFG_ASSIGN;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG)
 );
 
@@ -879,7 +904,7 @@ TRACE_EVENT(rdev_change_bss,
                 __entry->ap_isolate = params->ap_isolate;
                 __entry->ht_opmode = params->ht_opmode;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", use cts prot: %d, "
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", use cts prot: %d, "
                   "use short preamble: %d, use short slot time: %d, "
                   "ap isolate: %d, ht opmode: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->use_cts_prot,
@@ -909,7 +934,7 @@ TRACE_EVENT(rdev_set_txq_params,
                 __entry->cwmax = params->cwmax;
                 __entry->aifs = params->aifs;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", ac: %d, txop: %u, cwmin: %u, cwmax: %u, aifs: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", ac: %d, txop: %u, cwmin: %u, cwmax: %u, aifs: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->ac, __entry->txop,
                   __entry->cwmin, __entry->cwmax, __entry->aifs)
 );
@@ -928,26 +953,24 @@ TRACE_EVENT(rdev_libertas_set_mesh_channel,
                 NETDEV_ASSIGN;
                 CHAN_ASSIGN(chan);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT CHAN_PR_FMT, WIPHY_PR_ARG,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " CHAN_PR_FMT, WIPHY_PR_ARG,
                   NETDEV_PR_ARG, CHAN_PR_ARG)
 );
 
 TRACE_EVENT(rdev_set_monitor_channel,
-        TP_PROTO(struct wiphy *wiphy, struct ieee80211_channel *chan,
-                 enum nl80211_channel_type chan_type),
-        TP_ARGS(wiphy, chan, chan_type),
+        TP_PROTO(struct wiphy *wiphy,
+                 struct cfg80211_chan_def *chandef),
+        TP_ARGS(wiphy, chandef),
         TP_STRUCT__entry(
                 WIPHY_ENTRY
-                CHAN_ENTRY
-                __field(enum nl80211_channel_type, chan_type)
+                CHAN_DEF_ENTRY
         ),
         TP_fast_assign(
                 WIPHY_ASSIGN;
-                CHAN_ASSIGN(chan);
-                __entry->chan_type = chan_type;
+                CHAN_DEF_ASSIGN(chandef);
         ),
-        TP_printk(WIPHY_PR_FMT CHAN_PR_FMT ", channel type : %d",
-                  WIPHY_PR_ARG, CHAN_PR_ARG, __entry->chan_type)
+        TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT,
+                  WIPHY_PR_ARG, CHAN_DEF_PR_ARG)
 );
 
 TRACE_EVENT(rdev_auth,
@@ -969,7 +992,7 @@ TRACE_EVENT(rdev_auth,
                         memset(__entry->bssid, 0, ETH_ALEN);
                 __entry->auth_type = req->auth_type;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", auth type: %d, bssid: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", auth type: %d, bssid: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->auth_type,
                   MAC_PR_ARG(bssid))
 );
@@ -997,7 +1020,7 @@ TRACE_EVENT(rdev_assoc,
                 __entry->use_mfp = req->use_mfp;
                 __entry->flags = req->flags;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
                   ", previous bssid: " MAC_PR_FMT ", use mfp: %s, flags: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid),
                   MAC_PR_ARG(prev_bssid), BOOL_TO_STR(__entry->use_mfp),
@@ -1020,7 +1043,7 @@ TRACE_EVENT(rdev_deauth,
                 MAC_ASSIGN(bssid, req->bssid);
                 __entry->reason_code = req->reason_code;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", reason: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", reason: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid),
                   __entry->reason_code)
 );
@@ -1046,7 +1069,7 @@ TRACE_EVENT(rdev_disassoc,
                 __entry->reason_code = req->reason_code;
                 __entry->local_state_change = req->local_state_change;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
                   ", reason: %u, local state change: %s",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid),
                   __entry->reason_code,
@@ -1067,7 +1090,7 @@ TRACE_EVENT(rdev_mgmt_tx_cancel_wait,
                 WDEV_ASSIGN;
                 __entry->cookie = cookie;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT ", cookie: %llu ",
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie: %llu ",
                   WIPHY_PR_ARG, WDEV_PR_ARG, __entry->cookie)
 );
 
@@ -1087,7 +1110,7 @@ TRACE_EVENT(rdev_set_power_mgmt,
                 __entry->enabled = enabled;
                 __entry->timeout = timeout;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", %senabled, timeout: %d ",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", %senabled, timeout: %d ",
                   WIPHY_PR_ARG, NETDEV_PR_ARG,
                   __entry->enabled ? "" : "not ", __entry->timeout)
 );
@@ -1117,7 +1140,7 @@ TRACE_EVENT(rdev_connect,
                 __entry->wpa_versions = sme->crypto.wpa_versions;
                 __entry->flags = sme->flags;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT
                   ", ssid: %s, auth type: %d, privacy: %s, wpa versions: %u, "
                   "flags: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid), __entry->ssid,
@@ -1142,7 +1165,7 @@ TRACE_EVENT(rdev_set_cqm_rssi_config,
                 __entry->rssi_thold = rssi_thold;
                 __entry->rssi_hyst = rssi_hyst;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT
                   ", rssi_thold: %d, rssi_hyst: %u ",
                   WIPHY_PR_ARG, NETDEV_PR_ARG,
                  __entry->rssi_thold, __entry->rssi_hyst)
@@ -1166,7 +1189,7 @@ TRACE_EVENT(rdev_set_cqm_txe_config,
                 __entry->pkts = pkts;
                 __entry->intvl = intvl;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", rate: %u, packets: %u, interval: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", rate: %u, packets: %u, interval: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->rate, __entry->pkts,
                   __entry->intvl)
 );
@@ -1185,7 +1208,7 @@ TRACE_EVENT(rdev_disconnect,
                 NETDEV_ASSIGN;
                 __entry->reason_code = reason_code;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", reason code: %u", WIPHY_PR_ARG,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", reason code: %u", WIPHY_PR_ARG,
                   NETDEV_PR_ARG, __entry->reason_code)
 );
 
@@ -1206,7 +1229,7 @@ TRACE_EVENT(rdev_join_ibss,
                 memset(__entry->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);
                 memcpy(__entry->ssid, params->ssid, params->ssid_len);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", ssid: %s",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT ", ssid: %s",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid), __entry->ssid)
 );
 
@@ -1246,7 +1269,7 @@ TRACE_EVENT(rdev_set_tx_power,
                 __entry->type = type;
                 __entry->mbm = mbm;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT ", type: %d, mbm: %d",
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", type: %u, mbm: %d",
                   WIPHY_PR_ARG, WDEV_PR_ARG,__entry->type, __entry->mbm)
 );
 
@@ -1307,7 +1330,7 @@ TRACE_EVENT(rdev_set_bitrate_mask,
                 NETDEV_ASSIGN;
                 MAC_ASSIGN(peer, peer);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", peer: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
 );
 
@@ -1327,7 +1350,7 @@ TRACE_EVENT(rdev_mgmt_frame_register,
                 __entry->frame_type = frame_type;
                 __entry->reg = reg;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT ", frame_type: %u, reg: %s ",
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", frame_type: 0x%.2x, reg: %s ",
                   WIPHY_PR_ARG, WDEV_PR_ARG, __entry->frame_type,
                   __entry->reg ? "true" : "false")
 );
@@ -1413,7 +1436,7 @@ TRACE_EVENT(rdev_sched_scan_start,
                 WIPHY_ASSIGN;
                 NETDEV_ASSIGN;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG)
 );
 
@@ -1441,7 +1464,7 @@ TRACE_EVENT(rdev_tdls_mgmt,
                 __entry->status_code = status_code;
                 memcpy(__get_dynamic_array(buf), buf, len);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT MAC_PR_FMT ", action_code: %u, "
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", action_code: %u, "
                   "dialog_token: %u, status_code: %u, buf: %#.2x ",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer),
                   __entry->action_code, __entry->dialog_token,
@@ -1461,7 +1484,7 @@ TRACE_EVENT(rdev_dump_survey,
                 NETDEV_ASSIGN;
                 __entry->idx = idx;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", index: %d",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", index: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->idx)
 );
 
@@ -1518,7 +1541,7 @@ TRACE_EVENT(rdev_tdls_oper,
                 MAC_ASSIGN(peer, peer);
                 __entry->oper = oper;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT MAC_PR_FMT ", oper: %d",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT ", oper: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer), __entry->oper)
 );
 
@@ -1536,7 +1559,7 @@ DECLARE_EVENT_CLASS(rdev_pmksa,
                 NETDEV_ASSIGN;
                 MAC_ASSIGN(bssid, pmksa->bssid);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", bssid: " MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid))
 );
 
@@ -1554,7 +1577,7 @@ TRACE_EVENT(rdev_probe_client,
                 NETDEV_ASSIGN;
                 MAC_ASSIGN(peer, peer);
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT MAC_PR_FMT,
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", " MAC_PR_FMT,
                   WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(peer))
 );
 
@@ -1573,25 +1596,22 @@ DEFINE_EVENT(rdev_pmksa, rdev_del_pmksa,
 TRACE_EVENT(rdev_remain_on_channel,
         TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
                  struct ieee80211_channel *chan,
-                 enum nl80211_channel_type channel_type, unsigned int duration),
-        TP_ARGS(wiphy, wdev, chan, channel_type, duration),
+                 unsigned int duration),
+        TP_ARGS(wiphy, wdev, chan, duration),
         TP_STRUCT__entry(
                 WIPHY_ENTRY
                 WDEV_ENTRY
                 CHAN_ENTRY
-                __field(enum nl80211_channel_type, channel_type)
                 __field(unsigned int, duration)
         ),
         TP_fast_assign(
                 WIPHY_ASSIGN;
                 WDEV_ASSIGN;
                 CHAN_ASSIGN(chan);
-                __entry->channel_type = channel_type;
                 __entry->duration = duration;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT CHAN_PR_FMT ", channel type: %d, duration: %u",
-                  WIPHY_PR_ARG, WDEV_PR_ARG, CHAN_PR_ARG, __entry->channel_type,
-                  __entry->duration)
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", " CHAN_PR_FMT ", duration: %u",
+                  WIPHY_PR_ARG, WDEV_PR_ARG, CHAN_PR_ARG, __entry->duration)
 );
 
 TRACE_EVENT(rdev_return_int_cookie,
@@ -1624,25 +1644,20 @@ TRACE_EVENT(rdev_cancel_remain_on_channel,
                 WDEV_ASSIGN;
                 __entry->cookie = cookie;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT ", cookie: %llu",
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", cookie: %llu",
                   WIPHY_PR_ARG, WDEV_PR_ARG, __entry->cookie)
 );
 
 TRACE_EVENT(rdev_mgmt_tx,
         TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev,
                  struct ieee80211_channel *chan, bool offchan,
-                 enum nl80211_channel_type channel_type,
-                 bool channel_type_valid, unsigned int wait, bool no_cck,
-                 bool dont_wait_for_ack),
-        TP_ARGS(wiphy, wdev, chan, offchan, channel_type, channel_type_valid,
-                wait, no_cck, dont_wait_for_ack),
+                 unsigned int wait, bool no_cck, bool dont_wait_for_ack),
+        TP_ARGS(wiphy, wdev, chan, offchan, wait, no_cck, dont_wait_for_ack),
         TP_STRUCT__entry(
                 WIPHY_ENTRY
                 WDEV_ENTRY
                 CHAN_ENTRY
                 __field(bool, offchan)
-                __field(enum nl80211_channel_type, channel_type)
-                __field(bool, channel_type_valid)
                 __field(unsigned int, wait)
                 __field(bool, no_cck)
                 __field(bool, dont_wait_for_ack)
@@ -1652,18 +1667,14 @@ TRACE_EVENT(rdev_mgmt_tx,
                 WDEV_ASSIGN;
                 CHAN_ASSIGN(chan);
                 __entry->offchan = offchan;
-                __entry->channel_type = channel_type;
-                __entry->channel_type_valid = channel_type_valid;
                 __entry->wait = wait;
                 __entry->no_cck = no_cck;
                 __entry->dont_wait_for_ack = dont_wait_for_ack;
         ),
-        TP_printk(WIPHY_PR_FMT WDEV_PR_FMT CHAN_PR_FMT ", offchan: %s, "
-                  "channel type: %d, channel type valid: %s, wait: %u, "
-                  "no cck: %s, dont wait for ack: %s",
+        TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", " CHAN_PR_FMT ", offchan: %s,"
+                  " wait: %u, no cck: %s, dont wait for ack: %s",
                   WIPHY_PR_ARG, WDEV_PR_ARG, CHAN_PR_ARG,
-                  BOOL_TO_STR(__entry->offchan), __entry->channel_type,
-                  BOOL_TO_STR(__entry->channel_type_valid), __entry->wait,
+                  BOOL_TO_STR(__entry->offchan), __entry->wait,
                   BOOL_TO_STR(__entry->no_cck),
                   BOOL_TO_STR(__entry->dont_wait_for_ack))
 );
@@ -1682,7 +1693,7 @@ TRACE_EVENT(rdev_set_noack_map,
                 NETDEV_ASSIGN;
                 __entry->noack_map = noack_map;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", noack_map: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", noack_map: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->noack_map)
 );
 
@@ -1699,7 +1710,7 @@ TRACE_EVENT(rdev_get_et_sset_count,
                 NETDEV_ASSIGN;
                 __entry->sset = sset;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", sset: %d",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", sset: %d",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->sset)
 );
 
@@ -1716,7 +1727,7 @@ TRACE_EVENT(rdev_get_et_strings,
                 NETDEV_ASSIGN;
                 __entry->sset = sset;
         ),
-        TP_printk(WIPHY_PR_FMT NETDEV_PR_FMT ", sset: %u",
+        TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", sset: %u",
                   WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->sset)
 );
 
@@ -1725,22 +1736,25 @@ DEFINE_EVENT(wiphy_wdev_evt, rdev_get_channel,
         TP_ARGS(wiphy, wdev)
 );
 
-TRACE_EVENT(rdev_return_channel,
-        TP_PROTO(struct wiphy *wiphy, struct ieee80211_channel *chan,
-                 enum nl80211_channel_type type),
-        TP_ARGS(wiphy, chan, type),
+TRACE_EVENT(rdev_return_chandef,
+        TP_PROTO(struct wiphy *wiphy, int ret,
+                 struct cfg80211_chan_def *chandef),
+        TP_ARGS(wiphy, ret, chandef),
         TP_STRUCT__entry(
                 WIPHY_ENTRY
-                CHAN_ENTRY
-                __field(enum nl80211_channel_type, type)
+                __field(int, ret)
+                CHAN_DEF_ENTRY
         ),
         TP_fast_assign(
                 WIPHY_ASSIGN;
-                CHAN_ASSIGN(chan);
-                __entry->type = type;
+                if (ret == 0)
+                        CHAN_DEF_ASSIGN(chandef);
+                else
+                        CHAN_DEF_ASSIGN((struct cfg80211_chan_def *)NULL);
+                __entry->ret = ret;
         ),
-        TP_printk(WIPHY_PR_FMT CHAN_PR_FMT ", channel type: %d",
-                  WIPHY_PR_ARG, CHAN_PR_ARG, __entry->type)
+        TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT ", ret: %d",
+                  WIPHY_PR_ARG, CHAN_DEF_PR_ARG, __entry->ret)
 );
 
 DEFINE_EVENT(wiphy_wdev_evt, rdev_start_p2p_device,
@@ -1819,7 +1833,7 @@ TRACE_EVENT(cfg80211_send_rx_assoc,
                 MAC_ASSIGN(bssid, bss->bssid);
                 CHAN_ASSIGN(bss->channel);
         ),
-        TP_printk(NETDEV_PR_FMT MAC_PR_FMT CHAN_PR_FMT,
+        TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", " CHAN_PR_FMT,
                   NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
 );
 
@@ -1886,7 +1900,7 @@ TRACE_EVENT(cfg80211_michael_mic_failure,
                 __entry->key_id = key_id;
                 memcpy(__entry->tsc, tsc, 6);
         ),
-        TP_printk(NETDEV_PR_FMT MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",
+        TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",
                   NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type,
                   __entry->key_id, __entry->tsc)
 );
@@ -1894,47 +1908,41 @@ TRACE_EVENT(cfg80211_michael_mic_failure,
 TRACE_EVENT(cfg80211_ready_on_channel,
         TP_PROTO(struct wireless_dev *wdev, u64 cookie,
                  struct ieee80211_channel *chan,
-                 enum nl80211_channel_type channel_type, unsigned int duration),
-        TP_ARGS(wdev, cookie, chan, channel_type, duration),
+                 unsigned int duration),
+        TP_ARGS(wdev, cookie, chan, duration),
         TP_STRUCT__entry(
                 WDEV_ENTRY
                 __field(u64, cookie)
                 CHAN_ENTRY
-                __field(enum nl80211_channel_type, channel_type)
                 __field(unsigned int, duration)
         ),
         TP_fast_assign(
                 WDEV_ASSIGN;
                 __entry->cookie = cookie;
                 CHAN_ASSIGN(chan);
-                __entry->channel_type = channel_type;
                 __entry->duration = duration;
         ),
-        TP_printk(WDEV_PR_FMT ", cookie: %llu, " CHAN_PR_FMT ", channel type: %d, duration: %u",
+        TP_printk(WDEV_PR_FMT ", cookie: %llu, " CHAN_PR_FMT ", duration: %u",
                   WDEV_PR_ARG, __entry->cookie, CHAN_PR_ARG,
-                  __entry->channel_type, __entry->duration)
+                  __entry->duration)
 );
 
 TRACE_EVENT(cfg80211_ready_on_channel_expired,
         TP_PROTO(struct wireless_dev *wdev, u64 cookie,
-                 struct ieee80211_channel *chan,
-                 enum nl80211_channel_type channel_type),
-        TP_ARGS(wdev, cookie, chan, channel_type),
+                 struct ieee80211_channel *chan),
+        TP_ARGS(wdev, cookie, chan),
         TP_STRUCT__entry(
                 WDEV_ENTRY
                 __field(u64, cookie)
                 CHAN_ENTRY
-                __field(enum nl80211_channel_type, channel_type)
         ),
         TP_fast_assign(
                 WDEV_ASSIGN;
                 __entry->cookie = cookie;
                 CHAN_ASSIGN(chan);
-                __entry->channel_type = channel_type;
         ),
-        TP_printk(WDEV_PR_FMT ", cookie: %llu, " CHAN_PR_FMT ", channel type: %d",
-                  WDEV_PR_ARG, __entry->cookie, CHAN_PR_ARG,
-                  __entry->channel_type)
+        TP_printk(WDEV_PR_FMT ", cookie: %llu, " CHAN_PR_FMT,
+                  WDEV_PR_ARG, __entry->cookie, CHAN_PR_ARG)
 );
 
 TRACE_EVENT(cfg80211_new_sta,
@@ -1951,7 +1959,7 @@ TRACE_EVENT(cfg80211_new_sta,
                 MAC_ASSIGN(mac_addr, mac_addr);
                 SINFO_ASSIGN;
         ),
-        TP_printk(NETDEV_PR_FMT MAC_PR_FMT,
+        TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT,
                   NETDEV_PR_ARG, MAC_PR_ARG(mac_addr))
 );
 
@@ -2010,40 +2018,35 @@ TRACE_EVENT(cfg80211_cqm_rssi_notify,
                   NETDEV_PR_ARG, __entry->rssi_event)
 );
 
-TRACE_EVENT(cfg80211_can_beacon_sec_chan,
-        TP_PROTO(struct wiphy *wiphy, struct ieee80211_channel *channel,
-                 enum nl80211_channel_type channel_type),
-        TP_ARGS(wiphy, channel, channel_type),
+TRACE_EVENT(cfg80211_reg_can_beacon,
+        TP_PROTO(struct wiphy *wiphy, struct cfg80211_chan_def *chandef),
+        TP_ARGS(wiphy, chandef),
         TP_STRUCT__entry(
                 WIPHY_ENTRY
-                CHAN_ENTRY
-                __field(enum nl80211_channel_type, channel_type)
+                CHAN_DEF_ENTRY
         ),
         TP_fast_assign(
                 WIPHY_ASSIGN;
-                CHAN_ASSIGN(channel);
-                __entry->channel_type = channel_type;
+                CHAN_DEF_ASSIGN(chandef);
         ),
-        TP_printk(WIPHY_PR_FMT CHAN_PR_FMT ", channel_type: %d",
-                  WIPHY_PR_ARG, CHAN_PR_ARG, __entry->channel_type)
+        TP_printk(WIPHY_PR_FMT ", " CHAN_DEF_PR_FMT,
+                  WIPHY_PR_ARG, CHAN_DEF_PR_ARG)
 );
 
 TRACE_EVENT(cfg80211_ch_switch_notify,
-        TP_PROTO(struct net_device *netdev, int freq,
-                 enum nl80211_channel_type type),
-        TP_ARGS(netdev, freq, type),
+        TP_PROTO(struct net_device *netdev,
+                 struct cfg80211_chan_def *chandef),
+        TP_ARGS(netdev, chandef),
         TP_STRUCT__entry(
                 NETDEV_ENTRY
-                __field(int, freq)
-                __field(enum nl80211_channel_type, type)
+                CHAN_DEF_ENTRY
         ),
         TP_fast_assign(
                 NETDEV_ASSIGN;
-                __entry->freq = freq;
-                __entry->type = type;
+                CHAN_DEF_ASSIGN(chandef);
         ),
-        TP_printk(NETDEV_PR_FMT ", freq: %d, type: %d", NETDEV_PR_ARG,
-                  __entry->freq, __entry->type)
+        TP_printk(NETDEV_PR_FMT ", " CHAN_DEF_PR_FMT,
+                  NETDEV_PR_ARG, CHAN_DEF_PR_ARG)
 );
 
 DECLARE_EVENT_CLASS(cfg80211_rx_evt,
@@ -2057,7 +2060,7 @@ DECLARE_EVENT_CLASS(cfg80211_rx_evt,
                 NETDEV_ASSIGN;
                 MAC_ASSIGN(addr, addr);
         ),
-        TP_printk(NETDEV_PR_FMT MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
+        TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT, NETDEV_PR_ARG, MAC_PR_ARG(addr))
 );
 
 DEFINE_EVENT(cfg80211_rx_evt, cfg80211_ibss_joined,
@@ -2091,7 +2094,7 @@ TRACE_EVENT(cfg80211_probe_status,
                 __entry->cookie = cookie;
                 __entry->acked = acked;
         ),
-        TP_printk(NETDEV_PR_FMT MAC_PR_FMT ", cookie: %llu, acked: %s",
+        TP_printk(NETDEV_PR_FMT " addr:" MAC_PR_FMT ", cookie: %llu, acked: %s",
                   NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->cookie,
                   BOOL_TO_STR(__entry->acked))
 );
@@ -2241,7 +2244,7 @@ TRACE_EVENT(cfg80211_get_bss,
                 __entry->capa_mask = capa_mask;
                 __entry->capa_val = capa_val;
         ),
-        TP_printk(WIPHY_PR_FMT CHAN_PR_FMT MAC_PR_FMT ", buf: %#.2x, "
+        TP_printk(WIPHY_PR_FMT ", " CHAN_PR_FMT ", " MAC_PR_FMT ", buf: %#.2x, "
                   "capa_mask: %d, capa_val: %u", WIPHY_PR_ARG, CHAN_PR_ARG,
                   MAC_PR_ARG(bssid), ((u8 *)__get_dynamic_array(ssid))[0],
                   __entry->capa_mask, __entry->capa_val)
@@ -2265,7 +2268,7 @@ TRACE_EVENT(cfg80211_inform_bss_frame,
                         memcpy(__get_dynamic_array(mgmt), mgmt, len);
                 __entry->signal = signal;
         ),
-        TP_printk(WIPHY_PR_FMT CHAN_PR_FMT "signal: %d",
+        TP_printk(WIPHY_PR_FMT ", " CHAN_PR_FMT "signal: %d",
                   WIPHY_PR_ARG, CHAN_PR_ARG, __entry->signal)
 );
 
@@ -2280,7 +2283,7 @@ DECLARE_EVENT_CLASS(cfg80211_bss_evt,
                 MAC_ASSIGN(bssid, pub->bssid);
                 CHAN_ASSIGN(pub->channel);
         ),
-        TP_printk(MAC_PR_FMT CHAN_PR_FMT, MAC_PR_ARG(bssid), CHAN_PR_ARG)
+        TP_printk(MAC_PR_FMT ", " CHAN_PR_FMT, MAC_PR_ARG(bssid), CHAN_PR_ARG)
 );
 
 DEFINE_EVENT(cfg80211_bss_evt, cfg80211_return_bss,