Skip to content

Commit 036b8f5

Browse files
committed
tools headers uapi: Update linux/in.h copy
To get the changes in: 65b32f8 ("uapi: move IPPROTO_L2TP to in.h") 5854a09 ("net/ipv4: Use __DECLARE_FLEX_ARRAY() helper") That ends up automatically adding the new IPPROTO_L2TP to the socket args beautifiers: $ tools/perf/trace/beauty/socket.sh > before $ cp include/uapi/linux/in.h tools/include/uapi/linux/in.h $ tools/perf/trace/beauty/socket.sh > after $ diff -u before after --- before 2022-10-25 12:17:02.577892416 -0300 +++ after 2022-10-25 12:17:10.806113033 -0300 @@ -20,6 +20,7 @@ [98] = "ENCAP", [103] = "PIM", [108] = "COMP", + [115] = "L2TP", [132] = "SCTP", [136] = "UDPLITE", [137] = "MPLS", $ Now 'perf trace' will decode that 115 into "L2TP" and it will also be possible to use it in tracepoint filter expressions. Addresses this tools/perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs from latest version at 'include/uapi/linux/in.h' diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h Cc: Adrian Hunter <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paolo Abeni <[email protected]> Cc: Wojciech Drewek <[email protected]> Cc: David S. Miller <[email protected]> Cc: Gustavo A. R. Silva <[email protected]> Link: https://lore.kernel.org/lkml/Y1f%[email protected]/ Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 4402e36 commit 036b8f5

File tree

1 file changed

+8
-14
lines changed
  • tools/include/uapi/linux

1 file changed

+8
-14
lines changed

tools/include/uapi/linux/in.h

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ enum {
6868
#define IPPROTO_PIM IPPROTO_PIM
6969
IPPROTO_COMP = 108, /* Compression Header Protocol */
7070
#define IPPROTO_COMP IPPROTO_COMP
71+
IPPROTO_L2TP = 115, /* Layer 2 Tunnelling Protocol */
72+
#define IPPROTO_L2TP IPPROTO_L2TP
7173
IPPROTO_SCTP = 132, /* Stream Control Transport Protocol */
7274
#define IPPROTO_SCTP IPPROTO_SCTP
7375
IPPROTO_UDPLITE = 136, /* UDP-Lite (RFC 3828) */
@@ -188,21 +190,13 @@ struct ip_mreq_source {
188190
};
189191

190192
struct ip_msfilter {
193+
__be32 imsf_multiaddr;
194+
__be32 imsf_interface;
195+
__u32 imsf_fmode;
196+
__u32 imsf_numsrc;
191197
union {
192-
struct {
193-
__be32 imsf_multiaddr_aux;
194-
__be32 imsf_interface_aux;
195-
__u32 imsf_fmode_aux;
196-
__u32 imsf_numsrc_aux;
197-
__be32 imsf_slist[1];
198-
};
199-
struct {
200-
__be32 imsf_multiaddr;
201-
__be32 imsf_interface;
202-
__u32 imsf_fmode;
203-
__u32 imsf_numsrc;
204-
__be32 imsf_slist_flex[];
205-
};
198+
__be32 imsf_slist[1];
199+
__DECLARE_FLEX_ARRAY(__be32, imsf_slist_flex);
206200
};
207201
};
208202

0 commit comments

Comments
 (0)