github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 12:03:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: cfg80211: sort trace events again

Browse Source 
They were meant to be split into ops and APIs, but some
ops were added in the wrong place. Fix that.

Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240506210002.0b3a86a5d8d7.I5591c03223bdb95597e181de63a2eded424de34c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2024-05-06 21:00:02 +02:00
parent 23daf1b4c9
commit 2449db1f21
1 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
net/wireless/trace.h
View File

@ -2889,6 +2889,75 @@ DEFINE_EVENT(wiphy_wdev_link_evt, rdev_del_intf_link,
TP_ARGS(wiphy, wdev, link_id)
);
TRACE_EVENT(rdev_del_link_station,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct link_station_del_parameters *params),
TP_ARGS(wiphy, netdev, params),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
__array(u8, mld_mac, 6)
__field(u32, link_id)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
memset(__entry->mld_mac, 0, 6);
if (params->mld_mac)
memcpy(__entry->mld_mac, params->mld_mac, 6);
__entry->link_id = params->link_id;
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: %pM"
", link id: %u",
WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->mld_mac,
__entry->link_id)
);
TRACE_EVENT(rdev_set_hw_timestamp,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_set_hw_timestamp *hwts),
TP_ARGS(wiphy, netdev, hwts),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
MAC_ENTRY(macaddr)
__field(bool, enable)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
MAC_ASSIGN(macaddr, hwts->macaddr);
__entry->enable = hwts->enable;
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", mac %pM, enable: %u",
WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->macaddr,
__entry->enable)
);
TRACE_EVENT(rdev_set_ttlm,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_ttlm_params *params),
TP_ARGS(wiphy, netdev, params),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
__array(u8, dlink, sizeof(u16) * 8)
__array(u8, ulink, sizeof(u16) * 8)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
memcpy(__entry->dlink, params->dlink, sizeof(params->dlink));
memcpy(__entry->ulink, params->ulink, sizeof(params->ulink));
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT,
WIPHY_PR_ARG, NETDEV_PR_ARG)
);
/*************************************************************
* cfg80211 exported functions traces *
*************************************************************/
@ -3923,55 +3992,6 @@ DEFINE_EVENT(link_station_add_mod, rdev_mod_link_station,
TP_ARGS(wiphy, netdev, params)
);
TRACE_EVENT(rdev_del_link_station,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct link_station_del_parameters *params),
TP_ARGS(wiphy, netdev, params),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
__array(u8, mld_mac, 6)
__field(u32, link_id)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
memset(__entry->mld_mac, 0, 6);
if (params->mld_mac)
memcpy(__entry->mld_mac, params->mld_mac, 6);
__entry->link_id = params->link_id;
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: %pM"
", link id: %u",
WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->mld_mac,
__entry->link_id)
);
TRACE_EVENT(rdev_set_hw_timestamp,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_set_hw_timestamp *hwts),
TP_ARGS(wiphy, netdev, hwts),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
MAC_ENTRY(macaddr)
__field(bool, enable)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
MAC_ASSIGN(macaddr, hwts->macaddr);
__entry->enable = hwts->enable;
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", mac %pM, enable: %u",
WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->macaddr,
__entry->enable)
);
TRACE_EVENT(cfg80211_links_removed,
TP_PROTO(struct net_device *netdev, u16 link_mask),
TP_ARGS(netdev, link_mask),
@ -3987,26 +4007,6 @@ TRACE_EVENT(cfg80211_links_removed,
__entry->link_mask)
);
TRACE_EVENT(rdev_set_ttlm,
TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
struct cfg80211_ttlm_params *params),
TP_ARGS(wiphy, netdev, params),
TP_STRUCT__entry(
WIPHY_ENTRY
NETDEV_ENTRY
__array(u8, dlink, sizeof(u16) * 8)
__array(u8, ulink, sizeof(u16) * 8)
),
TP_fast_assign(
WIPHY_ASSIGN;
NETDEV_ASSIGN;
memcpy(__entry->dlink, params->dlink, sizeof(params->dlink));
memcpy(__entry->ulink, params->ulink, sizeof(params->ulink));
),
TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT,
WIPHY_PR_ARG, NETDEV_PR_ARG)
);
#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */
#undef TRACE_INCLUDE_PATH