diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/mac80211/trace.h | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index cfe1a0688b5c..02ac535d1274 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h | |||
| @@ -1330,6 +1330,13 @@ DEFINE_EVENT(local_sdata_evt, drv_mgd_prepare_tx, | |||
| 1330 | TP_ARGS(local, sdata) | 1330 | TP_ARGS(local, sdata) |
| 1331 | ); | 1331 | ); |
| 1332 | 1332 | ||
| 1333 | DEFINE_EVENT(local_sdata_evt, drv_mgd_protect_tdls_discover, | ||
| 1334 | TP_PROTO(struct ieee80211_local *local, | ||
| 1335 | struct ieee80211_sub_if_data *sdata), | ||
| 1336 | |||
| 1337 | TP_ARGS(local, sdata) | ||
| 1338 | ); | ||
| 1339 | |||
| 1333 | DECLARE_EVENT_CLASS(local_chanctx, | 1340 | DECLARE_EVENT_CLASS(local_chanctx, |
| 1334 | TP_PROTO(struct ieee80211_local *local, | 1341 | TP_PROTO(struct ieee80211_local *local, |
| 1335 | struct ieee80211_chanctx *ctx), | 1342 | struct ieee80211_chanctx *ctx), |