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

update headers (post 4.4 merge window)

This commit is contained in:
Stephen Hemminger 2016-01-18 09:40:13 -08:00
parent 2505780c20
commit 7321b7db6f
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/linux/bpf.h
View File

@ -273,6 +273,25 @@ enum bpf_func_id {
__BPF_FUNC_MAX_ID, __BPF_FUNC_MAX_ID,
}; };
/* All flags used by eBPF helper functions, placed here. */
/* BPF_FUNC_skb_store_bytes flags. */
#define BPF_F_RECOMPUTE_CSUM (1ULL << 0)
/* BPF_FUNC_l3_csum_replace and BPF_FUNC_l4_csum_replace flags.
* First 4 bits are for passing the header field size.
*/
#define BPF_F_HDR_FIELD_MASK 0xfULL
/* BPF_FUNC_l4_csum_replace flags. */
#define BPF_F_PSEUDO_HDR (1ULL << 4)
/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
#define BPF_F_INGRESS (1ULL << 0)
/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
#define BPF_F_TUNINFO_IPV6 (1ULL << 0)
/* user accessible mirror of in-kernel sk_buff. /* user accessible mirror of in-kernel sk_buff.
* new fields can only be added to the end of this structure * new fields can only be added to the end of this structure
*/ */
@ -296,7 +315,12 @@ struct __sk_buff {
struct bpf_tunnel_key { struct bpf_tunnel_key {
__u32 tunnel_id; __u32 tunnel_id;
__u32 remote_ipv4; union {
__u32 remote_ipv4;
__u32 remote_ipv6[4];
};
__u8 tunnel_tos;
__u8 tunnel_ttl;
}; };
#endif /* __LINUX_BPF_H__ */ #endif /* __LINUX_BPF_H__ */

4
include/linux/pkt_sched.h
View File

@ -72,6 +72,10 @@ struct tc_estimator {
#define TC_H_UNSPEC (0U) #define TC_H_UNSPEC (0U)
#define TC_H_ROOT (0xFFFFFFFFU) #define TC_H_ROOT (0xFFFFFFFFU)
#define TC_H_INGRESS (0xFFFFFFF1U) #define TC_H_INGRESS (0xFFFFFFF1U)
#define TC_H_CLSACT TC_H_INGRESS
#define TC_H_MIN_INGRESS 0xFFF2U
#define TC_H_MIN_EGRESS 0xFFF3U
/* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */ /* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */
enum tc_link_layer { enum tc_link_layer {