diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-09 10:57:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-09 10:57:10 -0700 |
| commit | c03fd0171ba6c8807ff5ba7c797896c84e18f3bc (patch) | |
| tree | b79899c124221db66049df5d3ccc8fb5eb75eb72 /net/mac80211/trace_msg.h | |
| parent | 869e3305f23dfeacdaa234717c92ccb237815d90 (diff) | |
| parent | 78ad2341521d5ea96cb936244ed4c4c4ef9ec13b (diff) | |
| download | linux-c03fd0171ba6c8807ff5ba7c797896c84e18f3bc.tar.bz2 | |
Merge tag 'mac80211-for-davem-2019-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Various fixes:
* iTXQ fixes from Felix
* tracing fix - increase message length
* fix SW_CRYPTO_CONTROL enforcement
* WMM rule handling for regdomain intersection
* max_interfaces in hwsim - reported by syzbot
* clear private data in some more commands
* a clang compiler warning fix
I added a patch with two new (unused) macros for
rate-limited printing to simplify getting the users
into the tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/trace_msg.h')
| -rw-r--r-- | net/mac80211/trace_msg.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/mac80211/trace_msg.h b/net/mac80211/trace_msg.h index 366b9e6f043e..40141df09f25 100644 --- a/net/mac80211/trace_msg.h +++ b/net/mac80211/trace_msg.h @@ -1,4 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0 */ +/* + * Portions of this file + * Copyright (C) 2019 Intel Corporation + */ + #ifdef CONFIG_MAC80211_MESSAGE_TRACING #if !defined(__MAC80211_MSG_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) @@ -11,7 +16,7 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM mac80211_msg -#define MAX_MSG_LEN 100 +#define MAX_MSG_LEN 120 DECLARE_EVENT_CLASS(mac80211_msg_event, TP_PROTO(struct va_format *vaf), |