From: Johannes Berg Add the NPCA parameters (NPCA primary channel and puncturing bitmap) to the chandef tracing. Signed-off-by: Johannes Berg --- net/mac80211/trace.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index 71cf88039bd4..562a4964afa3 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -44,7 +44,9 @@ __field(u32, n##center_freq1) \ __field(u32, n##freq1_offset) \ __field(u32, n##center_freq2) \ - __field(u16, n##punctured) + __field(u16, n##punctured) \ + __field(u32, n##npca_pri_freq) \ + __field(u16, n##npca_punctured) #define __CHANDEF_ASSIGN(n, c) \ __entry->n##control_freq = (c) && (c)->chan ? \ (c)->chan->center_freq : 0; \ @@ -54,14 +56,18 @@ __entry->n##center_freq1 = (c) ? (c)->center_freq1 : 0; \ __entry->n##freq1_offset = (c) ? (c)->freq1_offset : 0; \ __entry->n##center_freq2 = (c) ? (c)->center_freq2 : 0; \ - __entry->n##punctured = (c) ? (c)->punctured : 0; + __entry->n##punctured = (c) ? (c)->punctured : 0; \ + __entry->n##npca_pri_freq = (c) && (c)->npca_chan ? \ + (c)->npca_chan->center_freq : 0; \ + __entry->n##npca_punctured = (c) ? (c)->npca_punctured : 0; #define __CHANDEF_PR_FMT(n) \ - " " #n "(%d.%03d MHz,width:%d,center: %d.%03d/%d MHz, punct:0x%x)" + " " #n "(%d.%03d MHz,width:%d,center: %d.%03d/%d MHz, punct:0x%x, npca:%u, npca_punct:0x%x)" #define __CHANDEF_PR_ARG(n) \ __entry->n##control_freq, __entry->n##freq_offset, \ __entry->n##chan_width, __entry->n##center_freq1, \ __entry->n##freq1_offset, __entry->n##center_freq2, \ - __entry->n##punctured + __entry->n##punctured, __entry->n##npca_pri_freq, \ + __entry->n##npca_punctured #define CHANDEF_ENTRY __CHANDEF_ENTRY() #define CHANDEF_ASSIGN(c) __CHANDEF_ASSIGN(, c) -- 2.53.0