diff options
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index d4cee98533fd..e9ccf22f6dd9 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h | |||
| @@ -41,14 +41,31 @@ | |||
| 41 | #define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \ | 41 | #define CHANDEF_PR_ARG __entry->control_freq, __entry->chan_width, \ |
| 42 | __entry->center_freq1, __entry->center_freq2 | 42 | __entry->center_freq1, __entry->center_freq2 |
| 43 | 43 | ||
| 44 | #define MIN_CHANDEF_ENTRY \ | ||
| 45 | __field(u32, min_control_freq) \ | ||
| 46 | __field(u32, min_chan_width) \ | ||
| 47 | __field(u32, min_center_freq1) \ | ||
| 48 | __field(u32, min_center_freq2) | ||
| 49 | |||
| 50 | #define MIN_CHANDEF_ASSIGN(c) \ | ||
| 51 | __entry->min_control_freq = (c)->chan ? (c)->chan->center_freq : 0; \ | ||
| 52 | __entry->min_chan_width = (c)->width; \ | ||
| 53 | __entry->min_center_freq1 = (c)->center_freq1; \ | ||
| 54 | __entry->min_center_freq2 = (c)->center_freq2; | ||
| 55 | #define MIN_CHANDEF_PR_FMT " min_control:%d MHz min_width:%d min_center: %d/%d MHz" | ||
| 56 | #define MIN_CHANDEF_PR_ARG __entry->min_control_freq, __entry->min_chan_width, \ | ||
| 57 | __entry->min_center_freq1, __entry->min_center_freq2 | ||
| 58 | |||
| 44 | #define CHANCTX_ENTRY CHANDEF_ENTRY \ | 59 | #define CHANCTX_ENTRY CHANDEF_ENTRY \ |
| 60 | MIN_CHANDEF_ENTRY \ | ||
| 45 | __field(u8, rx_chains_static) \ | 61 | __field(u8, rx_chains_static) \ |
| 46 | __field(u8, rx_chains_dynamic) | 62 | __field(u8, rx_chains_dynamic) |
| 47 | #define CHANCTX_ASSIGN CHANDEF_ASSIGN(&ctx->conf.def) \ | 63 | #define CHANCTX_ASSIGN CHANDEF_ASSIGN(&ctx->conf.def) \ |
| 64 | MIN_CHANDEF_ASSIGN(&ctx->conf.min_def) \ | ||
| 48 | __entry->rx_chains_static = ctx->conf.rx_chains_static; \ | 65 | __entry->rx_chains_static = ctx->conf.rx_chains_static; \ |
| 49 | __entry->rx_chains_dynamic = ctx->conf.rx_chains_dynamic | 66 | __entry->rx_chains_dynamic = ctx->conf.rx_chains_dynamic |
| 50 | #define CHANCTX_PR_FMT CHANDEF_PR_FMT " chains:%d/%d" | 67 | #define CHANCTX_PR_FMT CHANDEF_PR_FMT MIN_CHANDEF_PR_FMT " chains:%d/%d" |
| 51 | #define CHANCTX_PR_ARG CHANDEF_PR_ARG, \ | 68 | #define CHANCTX_PR_ARG CHANDEF_PR_ARG, MIN_CHANDEF_PR_ARG, \ |
| 52 | __entry->rx_chains_static, __entry->rx_chains_dynamic | 69 | __entry->rx_chains_static, __entry->rx_chains_dynamic |
| 53 | 70 | ||
| 54 | 71 | ||