cfg80211: add vlan to station add/change tracing

This helps debug issues with VLAN modifications that are otherwise
not really visible in any tracing/debugging.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2015-03-20 19:56:41 +01:00
parent 7c10770f99
commit 5d8325ecb9

View File

@ -627,6 +627,7 @@ DECLARE_EVENT_CLASS(station_add_change,
__field(u8, plink_state) __field(u8, plink_state)
__field(u8, uapsd_queues) __field(u8, uapsd_queues)
__array(u8, ht_capa, (int)sizeof(struct ieee80211_ht_cap)) __array(u8, ht_capa, (int)sizeof(struct ieee80211_ht_cap))
__array(char, vlan, IFNAMSIZ)
), ),
TP_fast_assign( TP_fast_assign(
WIPHY_ASSIGN; WIPHY_ASSIGN;
@ -644,16 +645,19 @@ DECLARE_EVENT_CLASS(station_add_change,
if (params->ht_capa) if (params->ht_capa)
memcpy(__entry->ht_capa, params->ht_capa, memcpy(__entry->ht_capa, params->ht_capa,
sizeof(struct ieee80211_ht_cap)); sizeof(struct ieee80211_ht_cap));
memset(__entry->vlan, 0, sizeof(__entry->vlan));
if (params->vlan)
memcpy(__entry->vlan, params->vlan->name, IFNAMSIZ);
), ),
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 flags mask: %u, station flags set: %u, "
"station modify mask: %u, listen interval: %d, aid: %u, " "station modify mask: %u, listen interval: %d, aid: %u, "
"plink action: %u, plink state: %u, uapsd queues: %u", "plink action: %u, plink state: %u, uapsd queues: %u, vlan:%s",
WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac), WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac),
__entry->sta_flags_mask, __entry->sta_flags_set, __entry->sta_flags_mask, __entry->sta_flags_set,
__entry->sta_modify_mask, __entry->listen_interval, __entry->sta_modify_mask, __entry->listen_interval,
__entry->aid, __entry->plink_action, __entry->plink_state, __entry->aid, __entry->plink_action, __entry->plink_state,
__entry->uapsd_queues) __entry->uapsd_queues, __entry->vlan)
); );
DEFINE_EVENT(station_add_change, rdev_add_station, DEFINE_EVENT(station_add_change, rdev_add_station,