]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
update most kernel headers
authorStephen Hemminger <stephen@networkplumber.org>
Wed, 6 Jan 2016 17:14:29 +0000 (09:14 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Wed, 6 Jan 2016 17:14:29 +0000 (09:14 -0800)
still have issues with xtables

include/linux/bpf.h
include/linux/if_link.h
include/linux/ila.h

index 2e2524d4432c39fb6eff45957e6b447e8d93fc62..39e7f33c34200c41b91f87528e3c04c90bf4ced2 100644 (file)
@@ -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,
 };
 
index c9ad487d04f0eb295a164cd0ce65c6011165df34..d91f2c97d94655d97ec7b8747ed8d0a7e52059e8 100644 (file)
@@ -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 */
index f08e8d77ab694ea2234af0780d3cc2d55f0005b2..4f9e1deafc3da8b58c6e038ffd3221be4aa5f0c4 100644 (file)
@@ -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 */