Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2026-03-06 15:25:10 -08:00 · 2018-09-04 21:33:03 -07:00
parent 2fc4aa59ab 28619527b8
commit 36302685f5
239 changed files with 2428 additions and 1390 deletions
@@ -68,6 +68,7 @@ static const char * const map_type_name[] = {
 	[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",
 };