diff options
Diffstat (limited to 'net/mac80211/trace.h')
| -rw-r--r-- | net/mac80211/trace.h | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index db0d0132c58c..b8c53b4a710b 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -2,7 +2,7 @@  /*   * Portions of this file   * Copyright(c) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation   */  #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) @@ -17,7 +17,7 @@  #define MAXNAME		32  #define LOCAL_ENTRY	__array(char, wiphy_name, 32) -#define LOCAL_ASSIGN	strlcpy(__entry->wiphy_name, wiphy_name(local->hw.wiphy), MAXNAME) +#define LOCAL_ASSIGN	strscpy(__entry->wiphy_name, wiphy_name(local->hw.wiphy), MAXNAME)  #define LOCAL_PR_FMT	"%s"  #define LOCAL_PR_ARG	__entry->wiphy_name @@ -634,6 +634,7 @@ TRACE_EVENT(drv_set_key,  		LOCAL_ENTRY  		VIF_ENTRY  		STA_ENTRY +		__field(u32, cmd)  		KEY_ENTRY  	), @@ -641,12 +642,13 @@ TRACE_EVENT(drv_set_key,  		LOCAL_ASSIGN;  		VIF_ASSIGN;  		STA_ASSIGN; +		__entry->cmd = cmd;  		KEY_ASSIGN(key);  	),  	TP_printk( -		LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT KEY_PR_FMT, -		LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, KEY_PR_ARG +		LOCAL_PR_FMT  VIF_PR_FMT  STA_PR_FMT " cmd: %d" KEY_PR_FMT, +		LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->cmd, KEY_PR_ARG  	)  );  | 
