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)
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>

Trivial merge