Skip to content

Commit 9dbe666

Browse files
committed
tools headers: Update the socket headers with the kernel sources
To pick up the changes in: 64e8445 include: uapi: protocol number and packet structs for AGGFRAG in ESP 18912c5 tcp: devmem: don't write truncated dmabuf CMSGs to userspace Addressing this perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h Please see tools/include/uapi/README for further details. Acked-by: Ingo Molnar <[email protected]> Tested-by: Venkat Rao Bagalkote <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent ddc5929 commit 9dbe666

File tree

2 files changed

+4
-0
lines changed
  • tools
    • include/uapi/linux
    • perf/trace/beauty/include/linux

2 files changed

+4
-0
lines changed

tools/include/uapi/linux/in.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ enum {
7979
#define IPPROTO_MPLS IPPROTO_MPLS
8080
IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
8181
#define IPPROTO_ETHERNET IPPROTO_ETHERNET
82+
IPPROTO_AGGFRAG = 144, /* AGGFRAG in ESP (RFC 9347) */
83+
#define IPPROTO_AGGFRAG IPPROTO_AGGFRAG
8284
IPPROTO_RAW = 255, /* Raw IP packets */
8385
#define IPPROTO_RAW IPPROTO_RAW
8486
IPPROTO_SMC = 256, /* Shared Memory Communications */

tools/perf/trace/beauty/include/linux/socket.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,8 @@ struct ucred {
392392

393393
extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);
394394
extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
395+
extern int put_cmsg_notrunc(struct msghdr *msg, int level, int type, int len,
396+
void *data);
395397

396398
struct timespec64;
397399
struct __kernel_timespec;

0 commit comments

Comments
 (0)