Merge branch 'sockmap-build-fixes'

Browse source

John Fastabend says:

====================
bpf: sockmap build fixes

Two build fixes for sockmap, this should resolve the build errors
and warnings that were reported. Thanks everyone.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2017-08-16 15:34:13 -07:00

parent d978db8dbe 6bdc9c4c31

commit f31126b2cd

5 changed files with 19 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

include/linux/bpf.h

View file

2

include/linux/bpf_types.h

View file

5

kernel/bpf/Makefile

View file

1

kernel/bpf/core.c

View file

3

kernel/bpf/sockmap.c

View file