Re: [PATCH bpf-next] bpf: align map type names formatting.

2018-11-25 Thread Daniel Borkmann
On 11/24/2018 12:58 AM, David Calavera wrote:
> Make the formatting for map_type_name array consistent.
> 
> Signed-off-by: David Calavera 

Applied, thanks!


[PATCH bpf-next] bpf: align map type names formatting.

2018-11-23 Thread David Calavera

Make the formatting for map_type_name array consistent.

Signed-off-by: David Calavera 
---
tools/bpf/bpftool/map.c | 46 -
1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index b0ebbed7d1a6..cbd3080e72c7 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -52,30 +52,30 @@
#include "main.h"

static const char * const map_type_name[] = {
-   [BPF_MAP_TYPE_UNSPEC]   = "unspec",
-   [BPF_MAP_TYPE_HASH] = "hash",
-   [BPF_MAP_TYPE_ARRAY]= "array",
-   [BPF_MAP_TYPE_PROG_ARRAY]   = "prog_array",
-   [BPF_MAP_TYPE_PERF_EVENT_ARRAY] = "perf_event_array",
-   [BPF_MAP_TYPE_PERCPU_HASH]  = "percpu_hash",
-   [BPF_MAP_TYPE_PERCPU_ARRAY] = "percpu_array",
-   [BPF_MAP_TYPE_STACK_TRACE]  = "stack_trace",
-   [BPF_MAP_TYPE_CGROUP_ARRAY] = "cgroup_array",
-   [BPF_MAP_TYPE_LRU_HASH] = "lru_hash",
-   [BPF_MAP_TYPE_LRU_PERCPU_HASH]  = "lru_percpu_hash",
-   [BPF_MAP_TYPE_LPM_TRIE] = "lpm_trie",
-   [BPF_MAP_TYPE_ARRAY_OF_MAPS]= "array_of_maps",
-   [BPF_MAP_TYPE_HASH_OF_MAPS] = "hash_of_maps",
-   [BPF_MAP_TYPE_DEVMAP]   = "devmap",
-   [BPF_MAP_TYPE_SOCKMAP]  = "sockmap",
-   [BPF_MAP_TYPE_CPUMAP]   = "cpumap",
-   [BPF_MAP_TYPE_XSKMAP]   = "xskmap",
-   [BPF_MAP_TYPE_SOCKHASH] = "sockhash",
-   [BPF_MAP_TYPE_CGROUP_STORAGE]   = "cgroup_storage",
-   [BPF_MAP_TYPE_REUSEPORT_SOCKARRAY] = "reuseport_sockarray",
+   [BPF_MAP_TYPE_UNSPEC]   = "unspec",
+   [BPF_MAP_TYPE_HASH] = "hash",
+   [BPF_MAP_TYPE_ARRAY]= "array",
+   [BPF_MAP_TYPE_PROG_ARRAY]   = "prog_array",
+   [BPF_MAP_TYPE_PERF_EVENT_ARRAY] = "perf_event_array",
+   [BPF_MAP_TYPE_PERCPU_HASH]  = "percpu_hash",
+   [BPF_MAP_TYPE_PERCPU_ARRAY] = "percpu_array",
+   [BPF_MAP_TYPE_STACK_TRACE]  = "stack_trace",
+   [BPF_MAP_TYPE_CGROUP_ARRAY] = "cgroup_array",
+   [BPF_MAP_TYPE_LRU_HASH] = "lru_hash",
+   [BPF_MAP_TYPE_LRU_PERCPU_HASH]  = "lru_percpu_hash",
+   [BPF_MAP_TYPE_LPM_TRIE] = "lpm_trie",
+   [BPF_MAP_TYPE_ARRAY_OF_MAPS]= "array_of_maps",
+   [BPF_MAP_TYPE_HASH_OF_MAPS] = "hash_of_maps",
+   [BPF_MAP_TYPE_DEVMAP]   = "devmap",
+   [BPF_MAP_TYPE_SOCKMAP]  = "sockmap",
+   [BPF_MAP_TYPE_CPUMAP]   = "cpumap",
+   [BPF_MAP_TYPE_XSKMAP]   = "xskmap",
+   [BPF_MAP_TYPE_SOCKHASH] = "sockhash",
+   [BPF_MAP_TYPE_CGROUP_STORAGE]   = "cgroup_storage",
+   [BPF_MAP_TYPE_REUSEPORT_SOCKARRAY]  = "reuseport_sockarray",
[BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE]= "percpu_cgroup_storage",
-   [BPF_MAP_TYPE_QUEUE] = "queue",
-   [BPF_MAP_TYPE_STACK] = "stack",
+   [BPF_MAP_TYPE_QUEUE]= "queue",
+   [BPF_MAP_TYPE_STACK]= "stack",
};

static bool map_is_per_cpu(__u32 type)
--
2.17.1