diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-03-20 14:56:41 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-20 14:56:41 -0400 |
commit | 5d8325ecb9c21015f330eb0dcffcc5fc1b1fe5b8 (patch) | |
tree | 0004fd3fa3b295f0d18ae3b885defa9ec3bda445 | |
parent | 7c10770f995820ec1ed26c761b1583bfc4d88872 (diff) |
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>
-rw-r--r-- | net/wireless/trace.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index b19773c9c81b..e4e39143728c 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h | |||
@@ -627,6 +627,7 @@ DECLARE_EVENT_CLASS(station_add_change, | |||
627 | __field(u8, plink_state) | 627 | __field(u8, plink_state) |
628 | __field(u8, uapsd_queues) | 628 | __field(u8, uapsd_queues) |
629 | __array(u8, ht_capa, (int)sizeof(struct ieee80211_ht_cap)) | 629 | __array(u8, ht_capa, (int)sizeof(struct ieee80211_ht_cap)) |
630 | __array(char, vlan, IFNAMSIZ) | ||
630 | ), | 631 | ), |
631 | TP_fast_assign( | 632 | TP_fast_assign( |
632 | WIPHY_ASSIGN; | 633 | WIPHY_ASSIGN; |
@@ -644,16 +645,19 @@ DECLARE_EVENT_CLASS(station_add_change, | |||
644 | if (params->ht_capa) | 645 | if (params->ht_capa) |
645 | memcpy(__entry->ht_capa, params->ht_capa, | 646 | memcpy(__entry->ht_capa, params->ht_capa, |
646 | sizeof(struct ieee80211_ht_cap)); | 647 | sizeof(struct ieee80211_ht_cap)); |
648 | memset(__entry->vlan, 0, sizeof(__entry->vlan)); | ||
649 | if (params->vlan) | ||
650 | memcpy(__entry->vlan, params->vlan->name, IFNAMSIZ); | ||
647 | ), | 651 | ), |
648 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT | 652 | TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", station mac: " MAC_PR_FMT |
649 | ", station flags mask: %u, station flags set: %u, " | 653 | ", station flags mask: %u, station flags set: %u, " |
650 | "station modify mask: %u, listen interval: %d, aid: %u, " | 654 | "station modify mask: %u, listen interval: %d, aid: %u, " |
651 | "plink action: %u, plink state: %u, uapsd queues: %u", | 655 | "plink action: %u, plink state: %u, uapsd queues: %u, vlan:%s", |
652 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac), | 656 | WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(sta_mac), |
653 | __entry->sta_flags_mask, __entry->sta_flags_set, | 657 | __entry->sta_flags_mask, __entry->sta_flags_set, |
654 | __entry->sta_modify_mask, __entry->listen_interval, | 658 | __entry->sta_modify_mask, __entry->listen_interval, |
655 | __entry->aid, __entry->plink_action, __entry->plink_state, | 659 | __entry->aid, __entry->plink_action, __entry->plink_state, |
656 | __entry->uapsd_queues) | 660 | __entry->uapsd_queues, __entry->vlan) |
657 | ); | 661 | ); |
658 | 662 | ||
659 | DEFINE_EVENT(station_add_change, rdev_add_station, | 663 | DEFINE_EVENT(station_add_change, rdev_add_station, |