From: Daniel Borkmann <daniel@iogearbox.net>
Date: Wed, 6 Feb 2019 14:35:43 +0000 (+0100)
Subject: Merge branch 'bpf-xdp-hw-plus-generic'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97fc9c83beed006e38298a23bc58fc562e69b64e;p=linux.git

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

97fc9c83beed006e38298a23bc58fc562e69b64e