diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 20:38:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 20:38:49 -0500 |
| commit | 53c4ce02145be8987c2b5ca43d7fada9a9d3fd13 (patch) | |
| tree | 7fae6065a59905fde41a77c01c968088e526d0c4 /drivers/net | |
| parent | e3739099270b238630368b1d8f547c1bb31ba6ad (diff) | |
| parent | e00c7b216f34444252f3771f7d4ed48d4f032636 (diff) | |
Merge branch 'bpf-misc-next'
Daniel Borkmann says:
====================
BPF cleanups and misc updates
This patch set adds couple of cleanups in first few patches,
exposes owner_prog_type for array maps as well as mlocked mem
for maps in fdinfo, allows for mount permissions in fs and
fixes various outstanding issues in selftests and samples.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index eb3715700c95..876ab3a92ad5 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1518,7 +1518,7 @@ static int nfp_net_run_xdp(struct bpf_prog *prog, void *data, unsigned int len) xdp.data = data; xdp.data_end = data + len; - return BPF_PROG_RUN(prog, (void *)&xdp); + return BPF_PROG_RUN(prog, &xdp); } /** |