diff options
| author | David Ahern <dsahern@kernel.org> | 2023-08-02 09:28:53 -0600 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2023-08-02 09:28:53 -0600 |
| commit | 80e10ccff0bbb665bdd21039c29f793f058fd043 (patch) | |
| tree | a096f022a8e3edf95335ee2ed4dff312aea930f2 /include | |
| parent | 3fb794da9f170d0e101e59aa152d62d1b4154b63 (diff) | |
| parent | 84ffffeb0a2ff69e36bd972d57699f9e3bb29a48 (diff) | |
Merge remote-tracking branch 'main/main' into next
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/bpf_api.h | 2 | ||||
| -rw-r--r-- | include/bpf_elf.h | 2 | ||||
| -rw-r--r-- | include/bpf_util.h | 6 | ||||
| -rw-r--r-- | include/cg_map.h | 1 | ||||
| -rw-r--r-- | include/json_print.h | 8 | ||||
| -rw-r--r-- | include/utils.h | 7 |
6 files changed, 11 insertions, 15 deletions
diff --git a/include/bpf_api.h b/include/bpf_api.h index 82c47089..5887d3a8 100644 --- a/include/bpf_api.h +++ b/include/bpf_api.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ #ifndef __BPF_API__ #define __BPF_API__ diff --git a/include/bpf_elf.h b/include/bpf_elf.h index 84e8ae00..ea8a11c9 100644 --- a/include/bpf_elf.h +++ b/include/bpf_elf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */ #ifndef __BPF_ELF__ #define __BPF_ELF__ diff --git a/include/bpf_util.h b/include/bpf_util.h index 6a5f8ec6..1c924f50 100644 --- a/include/bpf_util.h +++ b/include/bpf_util.h @@ -1,11 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * bpf_util.h BPF common code * - * This program is free software; you can distribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - * * Authors: Daniel Borkmann <daniel@iogearbox.net> * Jiri Pirko <jiri@resnulli.us> */ diff --git a/include/cg_map.h b/include/cg_map.h index d30517fd..6293b50e 100644 --- a/include/cg_map.h +++ b/include/cg_map.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __CG_MAP_H__ #define __CG_MAP_H__ diff --git a/include/json_print.h b/include/json_print.h index 49d3cc14..0b1d84f7 100644 --- a/include/json_print.h +++ b/include/json_print.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* - * json_print.h "print regular or json output, based on json_writer". - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. + * json_print.h print regular or json output, based on json_writer. * * Authors: Julien Fortin, <julien@cumulusnetworks.com> */ diff --git a/include/utils.h b/include/utils.h index 0b5d86a2..3159dbab 100644 --- a/include/utils.h +++ b/include/utils.h @@ -38,8 +38,11 @@ extern int numeric; extern bool do_all; extern int echo_request; -#ifndef CONFDIR -#define CONFDIR "/etc/iproute2" +#ifndef CONF_USR_DIR +#define CONF_USR_DIR "/usr/lib/iproute2" +#endif +#ifndef CONF_ETC_DIR +#define CONF_ETC_DIR "/etc/iproute2" #endif #define SPRINT_BSIZE 64 |