Merge branch 'bpf-xdp-hw-plus-generic'
authorDaniel Borkmann <daniel@iogearbox.net>
Wed, 6 Feb 2019 14:35:43 +0000 (15:35 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 6 Feb 2019 14:35:43 +0000 (15:35 +0100)
commit97fc9c83beed006e38298a23bc58fc562e69b64e
tree27f1e97517d4c9a9de9797a07dc691b52584b703
parentf7748e2952387f1a67db3bc618050149427420c9
parent42a40e840d4499d06371096ec96fdb7b7018fabf
Merge branch 'bpf-xdp-hw-plus-generic'

Jakub Kicinski says:

====================
Offloaded and native/driver XDP programs can already coexist.
Allow offload and generic hook to coexist as well, there seem
to be no reason why not to do so.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>