On 05/20, Matteo Croce wrote: > On Mon, May 20, 2019 at 6:53 PM Stanislav Fomichev <sdf@xxxxxxxxxxx> wrote: > > > > On 05/18, Matteo Croce wrote: > > > Sync tools/include/linux/types.h with the UAPI one to fix this build error: > > > > > > make -C samples/bpf/../../tools/lib/bpf/ RM='rm -rf' LDFLAGS= srctree=samples/bpf/../../ O= > > > HOSTCC samples/bpf/sock_example > > > In file included from samples/bpf/sock_example.c:27: > > > /usr/include/linux/ip.h:102:2: error: unknown type name ‘__sum16’ > > > 102 | __sum16 check; > > > | ^~~~~~~ > > > make[2]: *** [scripts/Makefile.host:92: samples/bpf/sock_example] Error 1 > > > make[1]: *** [Makefile:1763: samples/bpf/] Error 2 > > > > > > Signed-off-by: Matteo Croce <mcroce@xxxxxxxxxx> > > > --- > > > tools/include/linux/types.h | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/tools/include/linux/types.h b/tools/include/linux/types.h > > > index 154eb4e3ca7c..5266dbfee945 100644 > > > --- a/tools/include/linux/types.h > > > +++ b/tools/include/linux/types.h > > > @@ -58,6 +58,9 @@ typedef __u32 __bitwise __be32; > > > typedef __u64 __bitwise __le64; > > > typedef __u64 __bitwise __be64; > > > > > > +typedef __u16 __bitwise __sum16; > > > +typedef __u32 __bitwise __wsum; > > If you do that, you should probably remove 'typedef __u16 __sum16;' > > from test_progs.h: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/test_progs.h#n13 > > > > > + > > > typedef struct { > > > int counter; > > > } atomic_t; > > > -- > > > 2.21.0 > > > > > Hi, > > I see test_progs.h only included in tools/testing/selftests/bpf/prog_tests/*, > so maybe it's unreladed to my change in samples/bpf/. > Maybe in a different patchset. Yes, I'm just saying that now that you have __sum16 defined in tools/include/linux/types.h you can have another patch to remove that custom __sum16 typedef from tests_progs.h
