AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/tools/perf/trace/beauty/socket.c
..
..
@@ -1,4 +1,4 @@
1
-// SPDX-License-Identifier: GPL-2.0
1
+// SPDX-License-Identifier: LGPL-2.1
2
2
 /*
3
3
  * trace/beauty/socket.c
4
4
  *
..
..
@@ -9,12 +9,12 @@
9
9
 #include <sys/types.h>
10
10
 #include <sys/socket.h>
11
11
 
12
-static size_t socket__scnprintf_ipproto(int protocol, char *bf, size_t size)
12
+static size_t socket__scnprintf_ipproto(int protocol, char *bf, size_t size, bool show_prefix)
13
13
 {
14
14
 #include "trace/beauty/generated/socket_ipproto_array.c"
15
-	static DEFINE_STRARRAY(socket_ipproto);
15
+	static DEFINE_STRARRAY(socket_ipproto, "IPPROTO_");
16
16
 
17
-	return strarray__scnprintf(&strarray__socket_ipproto, bf, size, "%d", protocol);
17
+	return strarray__scnprintf(&strarray__socket_ipproto, bf, size, "%d", show_prefix, protocol);
18
18
 }
19
19
 
20
20
 size_t syscall_arg__scnprintf_socket_protocol(char *bf, size_t size, struct syscall_arg *arg)
..
..
@@ -22,7 +22,7 @@
22
22
 	int domain = syscall_arg__val(arg, 0);
23
23
 
24
24
 	if (domain == AF_INET || domain == AF_INET6)
25
-		return socket__scnprintf_ipproto(arg->val, bf, size);
25
+		return socket__scnprintf_ipproto(arg->val, bf, size, arg->show_string_prefix);
26
26
 
27
27
 	return syscall_arg__scnprintf_int(bf, size, arg);
28
28
 }