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

update headers from pre 4.9 (net-next)

This commit is contained in:
Stephen Hemminger 2016-10-09 18:55:58 -07:00
parent d54e3ab985
commit d99272470a
7 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/bpf.h
View File

@ -419,6 +419,13 @@ enum bpf_func_id {
*/ */
BPF_FUNC_csum_update, BPF_FUNC_csum_update,
/**
* bpf_set_hash_invalid(skb)
* Invalidate current skb>hash.
* @skb: pointer to skb
*/
BPF_FUNC_set_hash_invalid,
__BPF_FUNC_MAX_ID, __BPF_FUNC_MAX_ID,
}; };

19
include/linux/if_link.h
View File

@ -617,7 +617,7 @@ enum {
enum { enum {
IFLA_VF_UNSPEC, IFLA_VF_UNSPEC,
IFLA_VF_MAC, /* Hardware queue specific attributes */ IFLA_VF_MAC, /* Hardware queue specific attributes */
IFLA_VF_VLAN, IFLA_VF_VLAN, /* VLAN ID and QoS */
IFLA_VF_TX_RATE, /* Max TX Bandwidth Allocation */ IFLA_VF_TX_RATE, /* Max TX Bandwidth Allocation */
IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */ IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */ IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */
@ -629,6 +629,7 @@ enum {
IFLA_VF_TRUST, /* Trust VF */ IFLA_VF_TRUST, /* Trust VF */
IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */ IFLA_VF_IB_NODE_GUID, /* VF Infiniband node GUID */
IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */ IFLA_VF_IB_PORT_GUID, /* VF Infiniband port GUID */
IFLA_VF_VLAN_LIST, /* nested list of vlans, option for QinQ */
__IFLA_VF_MAX, __IFLA_VF_MAX,
}; };
@ -645,6 +646,22 @@ struct ifla_vf_vlan {
__u32 qos; __u32 qos;
}; };
enum {
IFLA_VF_VLAN_INFO_UNSPEC,
IFLA_VF_VLAN_INFO, /* VLAN ID, QoS and VLAN protocol */
__IFLA_VF_VLAN_INFO_MAX,
};
#define IFLA_VF_VLAN_INFO_MAX (__IFLA_VF_VLAN_INFO_MAX - 1)
#define MAX_VLAN_LIST_LEN 1
struct ifla_vf_vlan_info {
__u32 vf;
__u32 vlan; /* 0 - 4095, 0 disables VLAN filter */
__u32 qos;
__be16 vlan_proto; /* VLAN protocol either 802.1Q or 802.1ad */
};
struct ifla_vf_tx_rate { struct ifla_vf_tx_rate {
__u32 vf; __u32 vf;
__u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */ __u32 rate; /* Max TX bandwidth in Mbps, 0 disables throttling */

1
include/linux/if_tunnel.h
View File

@ -39,6 +39,7 @@
#define GRE_IS_REC(f) ((f) & GRE_REC) #define GRE_IS_REC(f) ((f) & GRE_REC)
#define GRE_IS_ACK(f) ((f) & GRE_ACK) #define GRE_IS_ACK(f) ((f) & GRE_ACK)
#define GRE_VERSION_0 __cpu_to_be16(0x0000)
#define GRE_VERSION_1 __cpu_to_be16(0x0001) #define GRE_VERSION_1 __cpu_to_be16(0x0001)
#define GRE_PROTO_PPP __cpu_to_be16(0x880b) #define GRE_PROTO_PPP __cpu_to_be16(0x880b)
#define GRE_PPTP_KEY_MASK __cpu_to_be32(0xffff) #define GRE_PPTP_KEY_MASK __cpu_to_be32(0xffff)

1
include/linux/pkt_cls.h
View File

@ -342,6 +342,7 @@ enum {
TCA_BPF_FD, TCA_BPF_FD,
TCA_BPF_NAME, TCA_BPF_NAME,
TCA_BPF_FLAGS, TCA_BPF_FLAGS,
TCA_BPF_FLAGS_GEN,
__TCA_BPF_MAX, __TCA_BPF_MAX,
}; };

2
include/linux/pkt_sched.h
View File

@ -811,7 +811,7 @@ struct tc_fq_qd_stats {
__u32 flows; __u32 flows;
__u32 inactive_flows; __u32 inactive_flows;
__u32 throttled_flows; __u32 throttled_flows;
__u32 pad; __u32 unthrottle_latency_ns;
}; };
/* Heavy-Hitter Filter */ /* Heavy-Hitter Filter */

1
include/linux/tc_act/tc_vlan.h
View File

@ -16,6 +16,7 @@
#define TCA_VLAN_ACT_POP 1 #define TCA_VLAN_ACT_POP 1
#define TCA_VLAN_ACT_PUSH 2 #define TCA_VLAN_ACT_PUSH 2
#define TCA_VLAN_ACT_MODIFY 3
struct tc_vlan { struct tc_vlan {
tc_gen; tc_gen;

2
include/linux/xfrm.h
View File

@ -298,7 +298,7 @@ enum xfrm_attr_type_t {
XFRMA_ALG_AUTH_TRUNC, /* struct xfrm_algo_auth */ XFRMA_ALG_AUTH_TRUNC, /* struct xfrm_algo_auth */
XFRMA_MARK, /* struct xfrm_mark */ XFRMA_MARK, /* struct xfrm_mark */
XFRMA_TFCPAD, /* __u32 */ XFRMA_TFCPAD, /* __u32 */
XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_state_esn */
XFRMA_SA_EXTRA_FLAGS, /* __u32 */ XFRMA_SA_EXTRA_FLAGS, /* __u32 */
XFRMA_PROTO, /* __u8 */ XFRMA_PROTO, /* __u8 */
XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */