proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-24 10:14:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to net-next (4.3) headers

Browse Source
This commit is contained in:
Stephen Hemminger 2015-08-10 11:21:20 -07:00
parent baed90842a
commit 4f3489cd58
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/bpf.h
View File

@ -114,6 +114,7 @@ enum bpf_map_type {
BPF_MAP_TYPE_HASH,
BPF_MAP_TYPE_ARRAY,
BPF_MAP_TYPE_PROG_ARRAY,
BPF_MAP_TYPE_PERF_EVENT_ARRAY,
};
enum bpf_prog_type {
@ -270,6 +271,7 @@ enum bpf_func_id {
*/
BPF_FUNC_skb_get_tunnel_key,
BPF_FUNC_skb_set_tunnel_key,
BPF_FUNC_perf_event_read, /* u64 bpf_perf_event_read(&map, index) */
__BPF_FUNC_MAX_ID,
};
@ -290,6 +292,7 @@ struct __sk_buff {
__u32 ifindex;
__u32 tc_index;
__u32 cb[5];
__u32 hash;
};
struct bpf_tunnel_key {

1
include/linux/if_link.h
View File

@ -380,7 +380,6 @@ enum {
IFLA_VXLAN_REMCSUM_RX,
IFLA_VXLAN_GBP,
IFLA_VXLAN_REMCSUM_NOPARTIAL,
IFLA_VXLAN_FLOWBASED,
IFLA_VXLAN_COLLECT_METADATA,
__IFLA_VXLAN_MAX
};

2
include/linux/mpls.h
View File

@ -41,4 +41,6 @@ struct mpls_label {
#define MPLS_LABEL_OAMALERT 14 /* RFC3429 */
#define MPLS_LABEL_EXTENSION 15 /* RFC7274 */
#define MPLS_LABEL_FIRST_UNRESERVED 16 /* RFC3032 */
#endif /* _MPLS_H */