diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-18 00:29:25 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-18 00:29:25 +0100 |
| commit | 1118aa4c70a6978afb0c4391ad29826c14b842b3 (patch) | |
| tree | 7286d535c06b720d45f0427f9060b42bf8ab1425 /tools/perf/util/stat.h | |
| parent | net/smc: Use percpu ref for wr tx reference (diff) | |
| parent | Merge tag 'net-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-1118aa4c70a6978afb0c4391ad29826c14b842b3.tar.xz linux-1118aa4c70a6978afb0c4391ad29826c14b842b3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/wireless/nl80211.c
b27f07c50a73 ("wifi: nl80211: fix puncturing bitmap policy")
cbbaf2bb829b ("wifi: nl80211: add a command to enable/disable HW timestamping")
https://lore.kernel.org/all/20230314105421.3608efae@canb.auug.org.au
tools/testing/selftests/net/Makefile
62199e3f1658 ("selftests: net: Add VXLAN MDB test")
13715acf8ab5 ("selftest: Add test for bind() conflicts.")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/perf/util/stat.h')
| -rw-r--r-- | tools/perf/util/stat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index b1c29156c560..bf1794ebc916 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -166,7 +166,6 @@ struct perf_stat_config { FILE *output; unsigned int interval; unsigned int timeout; - int initial_delay; unsigned int unit_width; unsigned int metric_only_len; int times; |