From 835784525a179d4f0da545a8cf763614e1056a7b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sat, 18 Feb 2017 16:05:37 -0800 Subject: [PATCH] update headers from 4.10-rc8 Signed-off-by: Stephen Hemminger --- include/linux/bpf.h | 7 +++++++ include/linux/l2tp.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index b75635f2..2d452288 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -116,6 +116,12 @@ enum bpf_attach_type { #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE +/* If BPF_F_ALLOW_OVERRIDE flag is used in BPF_PROG_ATTACH command + * to the given target_fd cgroup the descendent cgroup will be able to + * override effective bpf program that was inherited from this cgroup + */ +#define BPF_F_ALLOW_OVERRIDE (1U << 0) + #define BPF_PSEUDO_MAP_FD 1 /* flags for BPF_MAP_UPDATE_ELEM command */ @@ -171,6 +177,7 @@ union bpf_attr { __u32 target_fd; /* container object to attach to */ __u32 attach_bpf_fd; /* eBPF program to attach */ __u32 attach_type; + __u32 attach_flags; }; } __attribute__((aligned(8))); diff --git a/include/linux/l2tp.h b/include/linux/l2tp.h index ac22738e..8a80007b 100644 --- a/include/linux/l2tp.h +++ b/include/linux/l2tp.h @@ -9,7 +9,8 @@ #include #include -#include +#include +#include #define IPPROTO_L2TP 115 @@ -29,7 +30,7 @@ struct sockaddr_l2tpip { __u32 l2tp_conn_id; /* Connection ID of tunnel */ /* Pad to size of `struct sockaddr'. */ - unsigned char __pad[sizeof(struct sockaddr) - + unsigned char __pad[__SOCK_SIZE__ - sizeof(__kernel_sa_family_t) - sizeof(__be16) - sizeof(struct in_addr) - sizeof(__u32)];