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

update kernel headers from net-next 

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-04-21 17:41:33 -07:00
parent e1b7f883e5
commit 5b0aa88737
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/bpf.h
View File

@ -603,6 +603,7 @@ struct __sk_buff {
__u32 tc_classid; __u32 tc_classid;
__u32 data; __u32 data;
__u32 data_end; __u32 data_end;
__u32 napi_id;
}; };
struct bpf_tunnel_key { struct bpf_tunnel_key {

3
include/linux/if_tunnel.h
View File

@ -75,6 +75,7 @@ enum {
IFLA_IPTUN_ENCAP_SPORT, IFLA_IPTUN_ENCAP_SPORT,
IFLA_IPTUN_ENCAP_DPORT, IFLA_IPTUN_ENCAP_DPORT,
IFLA_IPTUN_COLLECT_METADATA, IFLA_IPTUN_COLLECT_METADATA,
IFLA_IPTUN_FWMARK,
__IFLA_IPTUN_MAX, __IFLA_IPTUN_MAX,
}; };
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
@ -132,6 +133,7 @@ enum {
IFLA_GRE_ENCAP_DPORT, IFLA_GRE_ENCAP_DPORT,
IFLA_GRE_COLLECT_METADATA, IFLA_GRE_COLLECT_METADATA,
IFLA_GRE_IGNORE_DF, IFLA_GRE_IGNORE_DF,
IFLA_GRE_FWMARK,
__IFLA_GRE_MAX, __IFLA_GRE_MAX,
}; };
@ -147,6 +149,7 @@ enum {
IFLA_VTI_OKEY, IFLA_VTI_OKEY,
IFLA_VTI_LOCAL, IFLA_VTI_LOCAL,
IFLA_VTI_REMOTE, IFLA_VTI_REMOTE,
IFLA_VTI_FWMARK,
__IFLA_VTI_MAX, __IFLA_VTI_MAX,
}; };

8
include/linux/xfrm.h
View File

@ -303,6 +303,7 @@ enum xfrm_attr_type_t {
XFRMA_PROTO, /* __u8 */ XFRMA_PROTO, /* __u8 */
XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */
XFRMA_PAD, XFRMA_PAD,
XFRMA_OFFLOAD_DEV, /* struct xfrm_state_offload */
__XFRMA_MAX __XFRMA_MAX
#define XFRMA_MAX (__XFRMA_MAX - 1) #define XFRMA_MAX (__XFRMA_MAX - 1)
@ -494,6 +495,13 @@ struct xfrm_address_filter {
__u8 dplen; __u8 dplen;
}; };
struct xfrm_user_offload {
int ifindex;
__u8 flags;
};
#define XFRM_OFFLOAD_IPV6 1
#define XFRM_OFFLOAD_INBOUND 2
/* backwards compatibility for userspace */ /* backwards compatibility for userspace */
#define XFRMGRP_ACQUIRE 1 #define XFRMGRP_ACQUIRE 1
#define XFRMGRP_EXPIRE 2 #define XFRMGRP_EXPIRE 2