export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/include/uapi/asm-generic/socket.h
..
..
@@ -2,6 +2,7 @@
2
2
 #ifndef __ASM_GENERIC_SOCKET_H
3
3
 #define __ASM_GENERIC_SOCKET_H
4
4
 
5
+#include <linux/posix_types.h>
5
6
 #include <asm/sockios.h>
6
7
 
7
8
 /* For setsockopt(2) */
..
..
@@ -29,8 +30,8 @@
29
30
 #define SO_PEERCRED	17
30
31
 #define SO_RCVLOWAT	18
31
32
 #define SO_SNDLOWAT	19
32
-#define SO_RCVTIMEO	20
33
-#define SO_SNDTIMEO	21
33
+#define SO_RCVTIMEO_OLD	20
34
+#define SO_SNDTIMEO_OLD	21
34
35
 #endif
35
36
 
36
37
 /* Security levels - as per NRL IPv6 - don't actually do anything */
..
..
@@ -46,20 +47,13 @@
46
47
 #define SO_GET_FILTER		SO_ATTACH_FILTER
47
48
 
48
49
 #define SO_PEERNAME		28
49
-#define SO_TIMESTAMP		29
50
-#define SCM_TIMESTAMP		SO_TIMESTAMP
51
50
 
52
51
 #define SO_ACCEPTCONN		30
53
52
 
54
53
 #define SO_PEERSEC		31
55
54
 #define SO_PASSSEC		34
56
-#define SO_TIMESTAMPNS		35
57
-#define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
58
55
 
59
56
 #define SO_MARK			36
60
-
61
-#define SO_TIMESTAMPING		37
62
-#define SCM_TIMESTAMPING	SO_TIMESTAMPING
63
57
 
64
58
 #define SO_PROTOCOL		38
65
59
 #define SO_DOMAIN		39
..
..
@@ -110,4 +104,46 @@
110
104
 #define SO_TXTIME		61
111
105
 #define SCM_TXTIME		SO_TXTIME
112
106
 
107
+#define SO_BINDTOIFINDEX	62
108
+
109
+#define SO_TIMESTAMP_OLD        29
110
+#define SO_TIMESTAMPNS_OLD      35
111
+#define SO_TIMESTAMPING_OLD     37
112
+
113
+#define SO_TIMESTAMP_NEW        63
114
+#define SO_TIMESTAMPNS_NEW      64
115
+#define SO_TIMESTAMPING_NEW     65
116
+
117
+#define SO_RCVTIMEO_NEW         66
118
+#define SO_SNDTIMEO_NEW         67
119
+
120
+#define SO_DETACH_REUSEPORT_BPF 68
121
+
122
+#define SO_NETNS_COOKIE		71
123
+
124
+#if !defined(__KERNEL__)
125
+
126
+#if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))
127
+/* on 64-bit and x32, avoid the ?: operator */
128
+#define SO_TIMESTAMP		SO_TIMESTAMP_OLD
129
+#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD
130
+#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD
131
+
132
+#define SO_RCVTIMEO		SO_RCVTIMEO_OLD
133
+#define SO_SNDTIMEO		SO_SNDTIMEO_OLD
134
+#else
135
+#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)
136
+#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)
137
+#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)
138
+
139
+#define SO_RCVTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_RCVTIMEO_OLD : SO_RCVTIMEO_NEW)
140
+#define SO_SNDTIMEO (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_SNDTIMEO_OLD : SO_SNDTIMEO_NEW)
141
+#endif
142
+
143
+#define SCM_TIMESTAMP           SO_TIMESTAMP
144
+#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS
145
+#define SCM_TIMESTAMPING        SO_TIMESTAMPING
146
+
147
+#endif
148
+
113
149
 #endif /* __ASM_GENERIC_SOCKET_H */