Alan Maguire a2b2ae3812 bpftool: Fix compilation failure for net.o with older glibc ... commit 6f02b540d7 upstream. For older glibc ~2.17, #include'ing both linux/if.h and net/if.h fails due to complaints about redefinition of interface flags: CC net.o In file included from net.c:13:0: /usr/include/linux/if.h:71:2: error: redeclaration of enumerator ‘IFF_UP’ IFF_UP = 1<<0, /* sysfs */ ^ /usr/include/net/if.h:44:5: note: previous definition of ‘IFF_UP’ was here IFF_UP = 0x1, /* Interface is up. */ The issue was fixed in kernel headers in [1], but since compilation of net.c picks up system headers the problem can recur. Dropping #include <linux/if.h> resolves the issue and it is not needed for compilation anyhow. [1] https://lore.kernel.org/netdev/1461512707-23058-1-git-send-email-mikko.rapeli__34748.27880641$1462831734$gmane$org@iki.fi/ Fixes: f6f3bac08f ("tools/bpf: bpftool: add net support") Signed-off-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Martin KaFai Lau <kafai@fb.com> Link: https://lore.kernel.org/bpf/1609948746-15369-1-git-send-email-alan.maguire@oracle.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2021-01-17 14:05:37 +01:00
..
bpftool	bpftool: Fix compilation failure for net.o with older glibc	2021-01-17 14:05:37 +01:00
.gitignore	tools: bpf: account for generated feature/ and libbpf/ directories	2019-08-31 00:38:16 +02:00
Makefile	tools, bpf: Fix build for 'make -s tools/bpf O=<dir>'	2019-12-31 16:45:47 +01:00
Makefile.helpers	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
bpf_asm.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 232	2019-06-19 17:09:06 +02:00
bpf_dbg.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 232	2019-06-19 17:09:06 +02:00
bpf_exp.l	bpf: fix cbpf parser bug for octal numbers	2018-06-03 07:46:55 -07:00
bpf_exp.y	tools: rename tools/net directory to tools/bpf	2017-10-04 21:45:05 -07:00
bpf_jit_disasm.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 232	2019-06-19 17:09:06 +02:00