History

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

drivers/net/can/pch_can.c ae64438be192 ("can: dev: fix skb drop check") 1dd1b521be85 ("can: remove obsolete PCH CAN driver") https://lore.kernel.org/all/20221110102509.1f7d63cc@canb.auug.org.au/

Jakub Kicinski committed 4 years ago

Commit 966a9b42 parents c1b0510 4bbf342385 files · +4395 −2203Browse files

Showing the changes to tools/include/uapi/linux (2 of 385 files). Show all

Unified · Split

2 files
  1. tools/include/uapi/linux/in.h +1 −0
  2. tools/include/uapi/linux/stddef.h +47 −0
tools/include/uapi/linux/in.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 #define _UAPI_LINUX_IN_H
2121
2222 #include <linux/types.h>
23+#include <linux/stddef.h>
2324 #include <linux/libc-compat.h>
2425 #include <linux/socket.h>
2526
tools/include/uapi/linux/stddef.h+47−0
@@ -0,0 +1,47 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+#ifndef _LINUX_STDDEF_H
3+#define _LINUX_STDDEF_H
4+
5+
6+
7+#ifndef __always_inline
8+#define __always_inline __inline__
9+#endif
10+
11+/**
12+ * __struct_group() - Create a mirrored named and anonyomous struct
13+ *
14+ * @TAG: The tag name for the named sub-struct (usually empty)
15+ * @NAME: The identifier name of the mirrored sub-struct
16+ * @ATTRS: Any struct attributes (usually empty)
17+ * @MEMBERS: The member declarations for the mirrored structs
18+ *
19+ * Used to create an anonymous union of two structs with identical layout
20+ * and size: one anonymous and one named. The former's members can be used
21+ * normally without sub-struct naming, and the latter can be used to
22+ * reason about the start, end, and size of the group of struct members.
23+ * The named struct can also be explicitly tagged for layer reuse, as well
24+ * as both having struct attributes appended.
25+ */
26+#define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \
27+ union { \
28+ struct { MEMBERS } ATTRS; \
29+ struct TAG { MEMBERS } ATTRS NAME; \
30+ }
31+
32+/**
33+ * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
34+ *
35+ * @TYPE: The type of each flexible array element
36+ * @NAME: The name of the flexible array member
37+ *
38+ * In order to have a flexible array member in a union or alone in a
39+ * struct, it needs to be wrapped in an anonymous struct with at least 1
40+ * named member, but that member can be empty.
41+ */
42+#define __DECLARE_FLEX_ARRAY(TYPE, NAME) \
43+ struct { \
44+ struct { } __empty_ ## NAME; \
45+ TYPE NAME[]; \
46+ }
47+#endif