diff options
author | David S. Miller <davem@davemloft.net> | 2018-07-14 18:47:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-14 18:47:44 -0700 |
commit | 2aa4a3378ad077d02131a23d22641ae8ae44cb28 (patch) | |
tree | da31b9ef7436fb938c874d549d95a0ab1aac1b84 /drivers/net/tun.c | |
parent | f5c64e566c521456e9c34e3a7208dabab0eaf18b (diff) | |
parent | 13f7432bdd8eb2eb55eed2af1469d37c0f667617 (diff) | |
download | linux-2aa4a3378ad077d02131a23d22641ae8ae44cb28.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Daniel Borkmann says:
====================
pull-request: bpf-next 2018-07-15
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) Various different arm32 JIT improvements in order to optimize code emission
and make the JIT code itself more robust, from Russell.
2) Support simultaneous driver and offloaded XDP in order to allow for advanced
use-cases where some work is offloaded to the NIC and some to the host. Also
add ability for bpftool to load programs and maps beyond just the cgroup case,
from Jakub.
3) Add BPF JIT support in nfp for multiplication as well as division. For the
latter in particular, it uses the reciprocal algorithm to emulate it, from Jiong.
4) Add BTF pretty print functionality to bpftool in plain and JSON output
format, from Okash.
5) Add build and installation to the BPF helper man page into bpftool, from Quentin.
6) Add a TCP BPF callback for listening sockets which is triggered right after
the socket transitions to TCP_LISTEN state, from Andrey.
7) Add a new cgroup tree command to bpftool which iterates over the whole cgroup
tree and prints all attached programs, from Roman.
8) Improve xdp_redirect_cpu sample to support parsing of double VLAN tagged
packets, from Jesper.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 76f0f4131197..7b5748f86c9c 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1269,7 +1269,6 @@ static int tun_xdp(struct net_device *dev, struct netdev_bpf *xdp) return tun_xdp_set(dev, xdp->prog, xdp->extack); case XDP_QUERY_PROG: xdp->prog_id = tun_xdp_query(dev); - xdp->prog_attached = !!xdp->prog_id; return 0; default: return -EINVAL; |