wifi: mac80211: add NPCA to chandef tracing

Add the NPCA parameters (NPCA primary channel and puncturing bitmap)
to the chandef tracing.

Link: https://patch.msgid.link/20260428112708.28625e191054.I4b3728e594710dd01f7f154faddf7d98d898a45f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
index 71cf88039bd46387e83438ac89c3a11e9e87395a..562a4964afa3a24a1087a34a0793009e2ac5a457 100644 (file)
--- 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)