diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2018-01-17 19:13:26 -0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-01-18 22:54:25 +0100 |
| commit | 32852649ba3f74aab10025f2e59ca2b49d5cccfa (patch) | |
| tree | 883978611967a49e1fcea529e161c0b931a0d095 | |
| parent | ad46061fca87c0ab6670af3a44e03237f99d7a1f (diff) | |
| download | linux-stable-32852649ba3f74aab10025f2e59ca2b49d5cccfa.tar.gz linux-stable-32852649ba3f74aab10025f2e59ca2b49d5cccfa.tar.bz2 linux-stable-32852649ba3f74aab10025f2e59ca2b49d5cccfa.zip | |
bpf: arraymap: use bpf_map_init_from_attr()
Arraymap was not converted to use bpf_map_init_from_attr()
to avoid merge conflicts with emergency fixes. Do it now.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
| -rw-r--r-- | kernel/bpf/arraymap.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 68336092bfb4..b1f66480135b 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -120,12 +120,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) array->map.unpriv_array = unpriv; /* copy mandatory map attributes */ - array->map.map_type = attr->map_type; - array->map.key_size = attr->key_size; - array->map.value_size = attr->value_size; - array->map.max_entries = attr->max_entries; - array->map.map_flags = attr->map_flags; - array->map.numa_node = numa_node; + bpf_map_init_from_attr(&array->map, attr); array->elem_size = elem_size; if (!percpu) |