diff options
author | Eliad Peller <eliad@wizery.com> | 2011-09-21 07:06:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 14:27:48 -0400 |
commit | 37a41b4affa33bb237d3692bf51f1b5ebcaf29d8 (patch) | |
tree | 0201e166912d12bd8270b2117b11717756cfd5db /net/mac80211/driver-trace.h | |
parent | 129321804e36721e71fadcab5b475bd37bf53044 (diff) |
mac80211: add ieee80211_vif param to tsf functions
TSF can be kept per vif.
Add ieee80211_vif param to set/get/reset_tsf, and move
the debugfs entries to the per-vif directory.
Update all the drivers that implement these callbacks.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/driver-trace.h')
-rw-r--r-- | net/mac80211/driver-trace.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index f47b00dc7afd..07d94ff55798 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h | |||
@@ -726,35 +726,41 @@ TRACE_EVENT(drv_conf_tx, | |||
726 | ) | 726 | ) |
727 | ); | 727 | ); |
728 | 728 | ||
729 | DEFINE_EVENT(local_only_evt, drv_get_tsf, | 729 | DEFINE_EVENT(local_sdata_evt, drv_get_tsf, |
730 | TP_PROTO(struct ieee80211_local *local), | 730 | TP_PROTO(struct ieee80211_local *local, |
731 | TP_ARGS(local) | 731 | struct ieee80211_sub_if_data *sdata), |
732 | TP_ARGS(local, sdata) | ||
732 | ); | 733 | ); |
733 | 734 | ||
734 | TRACE_EVENT(drv_set_tsf, | 735 | TRACE_EVENT(drv_set_tsf, |
735 | TP_PROTO(struct ieee80211_local *local, u64 tsf), | 736 | TP_PROTO(struct ieee80211_local *local, |
737 | struct ieee80211_sub_if_data *sdata, | ||
738 | u64 tsf), | ||
736 | 739 | ||
737 | TP_ARGS(local, tsf), | 740 | TP_ARGS(local, sdata, tsf), |
738 | 741 | ||
739 | TP_STRUCT__entry( | 742 | TP_STRUCT__entry( |
740 | LOCAL_ENTRY | 743 | LOCAL_ENTRY |
744 | VIF_ENTRY | ||
741 | __field(u64, tsf) | 745 | __field(u64, tsf) |
742 | ), | 746 | ), |
743 | 747 | ||
744 | TP_fast_assign( | 748 | TP_fast_assign( |
745 | LOCAL_ASSIGN; | 749 | LOCAL_ASSIGN; |
750 | VIF_ASSIGN; | ||
746 | __entry->tsf = tsf; | 751 | __entry->tsf = tsf; |
747 | ), | 752 | ), |
748 | 753 | ||
749 | TP_printk( | 754 | TP_printk( |
750 | LOCAL_PR_FMT " tsf:%llu", | 755 | LOCAL_PR_FMT VIF_PR_FMT " tsf:%llu", |
751 | LOCAL_PR_ARG, (unsigned long long)__entry->tsf | 756 | LOCAL_PR_ARG, VIF_PR_ARG, (unsigned long long)__entry->tsf |
752 | ) | 757 | ) |
753 | ); | 758 | ); |
754 | 759 | ||
755 | DEFINE_EVENT(local_only_evt, drv_reset_tsf, | 760 | DEFINE_EVENT(local_sdata_evt, drv_reset_tsf, |
756 | TP_PROTO(struct ieee80211_local *local), | 761 | TP_PROTO(struct ieee80211_local *local, |
757 | TP_ARGS(local) | 762 | struct ieee80211_sub_if_data *sdata), |
763 | TP_ARGS(local, sdata) | ||
758 | ); | 764 | ); |
759 | 765 | ||
760 | DEFINE_EVENT(local_only_evt, drv_tx_last_beacon, | 766 | DEFINE_EVENT(local_only_evt, drv_tx_last_beacon, |