summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-12-25 10:43:08 +0100
committerIngo Molnar <mingo@kernel.org>2019-12-25 10:43:08 +0100
commit46f5cfc13d54962097cb0cc5f97593e2a98a6aed (patch)
tree1ec5da58e3d085a7e358a4b7adf3b6e6b7ce1753 /net/wireless
parent46cf053efec6a3a5f343fead837777efe8252a46 (diff)
parent2040cf9f59037aa8aec749363e69ead165b67b43 (diff)
downloadlinux-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.tar.bz2
Merge branch 'core/kprobes' into perf/core, to pick up a completed branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/trace.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index d98ad2b3143b..d5eaa4928baa 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -2009,7 +2009,7 @@ TRACE_EVENT(rdev_start_nan,
WIPHY_ENTRY
WDEV_ENTRY
__field(u8, master_pref)
- __field(u8, bands);
+ __field(u8, bands)
),
TP_fast_assign(
WIPHY_ASSIGN;
@@ -2031,8 +2031,8 @@ TRACE_EVENT(rdev_nan_change_conf,
WIPHY_ENTRY
WDEV_ENTRY
__field(u8, master_pref)
- __field(u8, bands);
- __field(u32, changes);
+ __field(u8, bands)
+ __field(u32, changes)
),
TP_fast_assign(
WIPHY_ASSIGN;