diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2016-01-06 09:14:29 -0800 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2016-01-06 09:14:29 -0800 |
commit | a4c89d808734fe980813587cc1b7899835376a62 (patch) | |
tree | 82872192fdae8256b7a60aabdff3f151a4f96774 | |
parent | 5cd1adba79d33644debd4ba498bb262c5bebcfba (diff) | |
download | iproute2-a4c89d808734fe980813587cc1b7899835376a62.tar.gz |
update most kernel headers
still have issues with xtables
-rw-r--r-- | include/linux/bpf.h | 1 | ||||
-rw-r--r-- | include/linux/if_link.h | 1 | ||||
-rw-r--r-- | include/linux/ila.h | 22 |
3 files changed, 24 insertions, 0 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 2e2524d4..39e7f33c 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -269,6 +269,7 @@ enum bpf_func_id { * Return: 0 on success */ BPF_FUNC_perf_event_output, + BPF_FUNC_skb_load_bytes, __BPF_FUNC_MAX_ID, }; diff --git a/include/linux/if_link.h b/include/linux/if_link.h index c9ad487d..d91f2c97 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -216,6 +216,7 @@ enum in6_addr_gen_mode { IN6_ADDR_GEN_MODE_EUI64, IN6_ADDR_GEN_MODE_NONE, IN6_ADDR_GEN_MODE_STABLE_PRIVACY, + IN6_ADDR_GEN_MODE_RANDOM, }; /* Bridge section */ diff --git a/include/linux/ila.h b/include/linux/ila.h index f08e8d77..4f9e1dea 100644 --- a/include/linux/ila.h +++ b/include/linux/ila.h @@ -3,13 +3,35 @@ #ifndef _LINUX_ILA_H #define _LINUX_ILA_H +/* NETLINK_GENERIC related info */ +#define ILA_GENL_NAME "ila" +#define ILA_GENL_VERSION 0x1 + enum { ILA_ATTR_UNSPEC, ILA_ATTR_LOCATOR, /* u64 */ + ILA_ATTR_IDENTIFIER, /* u64 */ + ILA_ATTR_LOCATOR_MATCH, /* u64 */ + ILA_ATTR_IFINDEX, /* s32 */ + ILA_ATTR_DIR, /* u32 */ __ILA_ATTR_MAX, }; #define ILA_ATTR_MAX (__ILA_ATTR_MAX - 1) +enum { + ILA_CMD_UNSPEC, + ILA_CMD_ADD, + ILA_CMD_DEL, + ILA_CMD_GET, + + __ILA_CMD_MAX, +}; + +#define ILA_CMD_MAX (__ILA_CMD_MAX - 1) + +#define ILA_DIR_IN (1 << 0) +#define ILA_DIR_OUT (1 << 1) + #endif /* _LINUX_ILA_H */ |