diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-06-15 18:19:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-15 18:19:47 -0700 |
| commit | 1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848 (patch) | |
| tree | bc9dd11610389aadebdc4e016d5035dff7aefaeb /include | |
| parent | Revert "net: phylink: set the autoneg state in phylink_phy_change" (diff) | |
| parent | bpf: fix nested bpf tracepoints with per-cpu data (diff) | |
| download | linux-dev-1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848.tar.xz linux-dev-1eb4169c1e6b3c95f3a99c2c7f91b10e6c98e848.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-06-15
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) fix stack layout of JITed x64 bpf code, from Alexei.
2) fix out of bounds memory access in bpf_sk_storage, from Arthur.
3) fix lpm trie walk, from Jonathan.
4) fix nested bpf_perf_event_output, from Matt.
5) and several other fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/bpf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index e4114a7e4451..a8b823c30b43 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3378,8 +3378,8 @@ struct bpf_raw_tracepoint_args { /* DIRECT: Skip the FIB rules and go to FIB table associated with device * OUTPUT: Do lookup from egress perspective; default is ingress */ -#define BPF_FIB_LOOKUP_DIRECT BIT(0) -#define BPF_FIB_LOOKUP_OUTPUT BIT(1) +#define BPF_FIB_LOOKUP_DIRECT (1U << 0) +#define BPF_FIB_LOOKUP_OUTPUT (1U << 1) enum { BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */ |