matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update headers from 4.10-rc8 

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-02-18 16:05:37 -08:00
parent b6d8c4a606
commit 835784525a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/bpf.h
View File

@ -116,6 +116,12 @@ enum bpf_attach_type {
#define MAX_BPF_ATTACH_TYPE __MAX_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 #define BPF_PSEUDO_MAP_FD 1
/* flags for BPF_MAP_UPDATE_ELEM command */ /* flags for BPF_MAP_UPDATE_ELEM command */
@ -171,6 +177,7 @@ union bpf_attr {
__u32 target_fd; /* container object to attach to */ __u32 target_fd; /* container object to attach to */
__u32 attach_bpf_fd; /* eBPF program to attach */ __u32 attach_bpf_fd; /* eBPF program to attach */
__u32 attach_type; __u32 attach_type;
__u32 attach_flags;
}; };
} __attribute__((aligned(8))); } __attribute__((aligned(8)));

5
include/linux/l2tp.h
View File

@ -9,7 +9,8 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <netinet/in.h> #include <linux/in.h>
#include <linux/in6.h>
#define IPPROTO_L2TP 115 #define IPPROTO_L2TP 115
@ -29,7 +30,7 @@ struct sockaddr_l2tpip {
__u32 l2tp_conn_id; /* Connection ID of tunnel */ __u32 l2tp_conn_id; /* Connection ID of tunnel */
/* Pad to size of `struct sockaddr'. */ /* Pad to size of `struct sockaddr'. */
unsigned char __pad[sizeof(struct sockaddr) - unsigned char __pad[__SOCK_SIZE__ -
sizeof(__kernel_sa_family_t) - sizeof(__kernel_sa_family_t) -
sizeof(__be16) - sizeof(struct in_addr) - sizeof(__be16) - sizeof(struct in_addr) -
sizeof(__u32)]; sizeof(__u32)];