summaryrefslogtreecommitdiff
path: root/net/mac80211/trace.h
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-10-17 14:02:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-10-17 14:02:07 -0400
commit9f96da4dd2ccf685b506a21104cb13b1aadd907a (patch)
tree5d9eff61123f096e2434a9d36e6fdbd4cc5c6292 /net/mac80211/trace.h
parentccdbb6e96beca362db876d820ac1e560ff6d9579 (diff)
parentb6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff)
downloadlinux-stable-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.gz
linux-stable-9f96da4dd2ccf685b506a21104cb13b1aadd907a.tar.bz2
linux-stable-9f96da4dd2ccf685b506a21104cb13b1aadd907a.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/trace.h')
-rw-r--r--net/mac80211/trace.h35
1 files changed, 35 insertions, 0 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 3fb9dd6d02fc..d4cee98533fd 100644
--- a/net/mac80211/trace.h
+++ b/net/mac80211/trace.h
@@ -1475,6 +1475,41 @@ DEFINE_EVENT(local_sdata_evt, drv_ipv6_addr_change,
);
#endif
+TRACE_EVENT(drv_join_ibss,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata,
+ struct ieee80211_bss_conf *info),
+
+ TP_ARGS(local, sdata, info),
+
+ TP_STRUCT__entry(
+ LOCAL_ENTRY
+ VIF_ENTRY
+ __field(u8, dtimper)
+ __field(u16, bcnint)
+ __dynamic_array(u8, ssid, info->ssid_len);
+ ),
+
+ TP_fast_assign(
+ LOCAL_ASSIGN;
+ VIF_ASSIGN;
+ __entry->dtimper = info->dtim_period;
+ __entry->bcnint = info->beacon_int;
+ memcpy(__get_dynamic_array(ssid), info->ssid, info->ssid_len);
+ ),
+
+ TP_printk(
+ LOCAL_PR_FMT VIF_PR_FMT,
+ LOCAL_PR_ARG, VIF_PR_ARG
+ )
+);
+
+DEFINE_EVENT(local_sdata_evt, drv_leave_ibss,
+ TP_PROTO(struct ieee80211_local *local,
+ struct ieee80211_sub_if_data *sdata),
+ TP_ARGS(local, sdata)
+);
+
/*
* Tracing for API calls that drivers call.
*/