diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-25 10:43:08 +0100 |
| commit | 46f5cfc13d54962097cb0cc5f97593e2a98a6aed (patch) | |
| tree | 1ec5da58e3d085a7e358a4b7adf3b6e6b7ce1753 /net/wireless | |
| parent | Linux 5.5-rc3 (diff) | |
| parent | Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts (diff) | |
| download | linux-dev-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.tar.xz linux-dev-46f5cfc13d54962097cb0cc5f97593e2a98a6aed.zip | |
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.h | 6 |
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; |