diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-07 08:10:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-07 08:10:13 +0300 |
| commit | 3793faad7b5b730941b2efbc252d14374b60843a (patch) | |
| tree | e1bea43727d87f8fd30ca169f465a3591f15d63b /include/uapi/linux/bpf.h | |
| parent | ae1804de93f6f1626906567ae7deec8e0111259d (diff) | |
| parent | a811c1fa0a02c062555b54651065899437bacdbe (diff) | |
| download | linux-3793faad7b5b730941b2efbc252d14374b60843a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts were all overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/bpf.h')
| -rw-r--r-- | include/uapi/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index b3643e27e264..101b0c8a3784 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -73,7 +73,7 @@ struct bpf_insn { /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */ struct bpf_lpm_trie_key { __u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */ - __u8 data[]; /* Arbitrary size */ + __u8 data[0]; /* Arbitrary size */ }; struct bpf_cgroup_storage_key { |