Merge branch 'sockmap-fixes'

Browse source

Daniel Borkmann says:

====================
Two sockmap fixes in bpf_tcp_sendmsg(), and one fix for the
sockmap kernel selftest. Thanks!
====================

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

...

This commit is contained in:

Alexei Starovoitov 2018-08-08 12:06:18 -07:00

parent 74682128c6 3c6ed988fd

commit bf9bae0ea6

2 changed files with 7 additions and 4 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

9

kernel/bpf/sockmap.c

View file

2

tools/testing/selftests/bpf/test_sockmap.c

View file