Showing the changes to include/uapi/linux (3 of 66 files). Show all
Unified · Split
| @@ -123,6 +123,12 @@ enum bpf_attach_type { · 122 unmodified lines | ||
| 123 | 123 | |
| 124 | 124 | #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE |
| 125 | 125 | |
| 126 | +/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command | |
| 127 | + * to the given target_fd cgroup the descendent cgroup will be able to | |
| 128 | + * override effective bpf program that was inherited from this cgroup | |
| 129 | + */ | |
| 130 | +#define BPF_F_ALLOW_OVERRIDE (1U << 0) | |
| 131 | + | |
| 126 | 132 | #define BPF_PSEUDO_MAP_FD 1 |
| 127 | 133 | |
| 128 | 134 | /* flags for BPF_MAP_UPDATE_ELEM command */ |
| @@ -178,6 +184,7 @@ union bpf_attr { · 49 unmodified lines | ||
| 178 | 184 | __u32 target_fd; /* container object to attach to */ |
| 179 | 185 | __u32 attach_bpf_fd; /* eBPF program to attach */ |
| 180 | 186 | __u32 attach_type; |
| 187 | + __u32 attach_flags; | |
| 181 | 188 | }; |
| 182 | 189 | } __attribute__((aligned(8))); |
| 183 | 190 | |
| @@ -9,9 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | |
| 10 | 10 | #include <linux/types.h> |
| 11 | 11 | #include <linux/socket.h> |
| 12 | −#ifndef __KERNEL__ | |
| 13 | −#include <netinet/in.h> | |
| 14 | −#endif | |
| 12 | +#include <linux/in.h> | |
| 13 | +#include <linux/in6.h> | |
| 15 | 14 | |
| 16 | 15 | #define IPPROTO_L2TP 115 |
| 17 | 16 | |
| @@ -31,7 +30,7 @@ struct sockaddr_l2tpip { · 13 unmodified lines | ||
| 31 | 30 | __u32 l2tp_conn_id; /* Connection ID of tunnel */ |
| 32 | 31 | |
| 33 | 32 | /* Pad to size of `struct sockaddr'. */ |
| 34 | − unsigned char __pad[sizeof(struct sockaddr) - | |
| 33 | + unsigned char __pad[__SOCK_SIZE__ - | |
| 35 | 34 | sizeof(__kernel_sa_family_t) - |
| 36 | 35 | sizeof(__be16) - sizeof(struct in_addr) - |
| 37 | 36 | sizeof(__u32)]; |
| @@ -362,8 +362,8 @@ enum v4l2_quantization { · 361 unmodified lines | ||
| 362 | 362 | /* |
| 363 | 363 | * The default for R'G'B' quantization is always full range, except |
| 364 | 364 | * for the BT2020 colorspace. For Y'CbCr the quantization is always |
| 365 | − * limited range, except for COLORSPACE_JPEG, SRGB, ADOBERGB, | |
| 366 | − * XV601 or XV709: those are full range. | |
| 365 | + * limited range, except for COLORSPACE_JPEG, XV601 or XV709: those | |
| 366 | + * are full range. | |
| 367 | 367 | */ |
| 368 | 368 | V4L2_QUANTIZATION_DEFAULT = 0, |
| 369 | 369 | V4L2_QUANTIZATION_FULL_RANGE = 1, |
| @@ -379,8 +379,7 @@ enum v4l2_quantization { · 9 unmodified lines | ||
| 379 | 379 | (((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \ |
| 380 | 380 | V4L2_QUANTIZATION_LIM_RANGE : \ |
| 381 | 381 | (((is_rgb_or_hsv) || (ycbcr_enc) == V4L2_YCBCR_ENC_XV601 || \ |
| 382 | − (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) || \ | |
| 383 | − (colsp) == V4L2_COLORSPACE_ADOBERGB || (colsp) == V4L2_COLORSPACE_SRGB ? \ | |
| 382 | + (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) ? \ | |
| 384 | 383 | V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) |
| 385 | 384 | |
| 386 | 385 | enum v4l2_priority { |