diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-11-05 22:26:20 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-05 22:26:20 +0900 |
| commit | 8a3b718ac2c29abcba8e12636710cff3cee8c01b (patch) | |
| tree | 8993f6c89d54cc54d2fb083635abe832d4f3b5bb /net/core/rtnetlink.c | |
| parent | mISDN: l1oip_core: replace _manual_ swap with swap macro (diff) | |
| parent | bpf: remove old offload/analyzer (diff) | |
| download | wireguard-linux-8a3b718ac2c29abcba8e12636710cff3cee8c01b.tar.xz wireguard-linux-8a3b718ac2c29abcba8e12636710cff3cee8c01b.zip | |
Merge branch 'bpf-add-offload-as-a-first-class-citizen'
Jakub Kicinski says:
====================
bpf: add offload as a first class citizen
This series is my stab at what was discussed at a recent IOvisor
bi-weekly call. The idea is to make the device translator run at
the program load time. This makes the offload more explicit to
the user space. It also makes it easy for the device translator
to insert information into the original verifier log.
v2:
- include linux/bug.h instead of asm/bug.h;
- rebased on top of Craig's verifier fix (no changes, the last patch
just removes more code now). I checked the set doesn't conflict
with Jiri's, Josef's or Roman's patches, but missed Craig's fix :(
v1:
- rename the ifindex member on load;
- improve commit messages;
- split nfp patches more.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 8a8c51937edf..dc5ad84ac096 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1270,10 +1270,10 @@ static u8 rtnl_xdp_attached_mode(struct net_device *dev, u32 *prog_id) *prog_id = generic_xdp_prog->aux->id; return XDP_ATTACHED_SKB; } - if (!ops->ndo_xdp) + if (!ops->ndo_bpf) return XDP_ATTACHED_NONE; - return __dev_xdp_attached(dev, ops->ndo_xdp, prog_id); + return __dev_xdp_attached(dev, ops->ndo_bpf, prog_id); } static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev) |