update headers from 4.15-rc1

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index e96d40b9c79dacdb949e972d27b2c68b4ed4315c..81f9145fc5a633627e87cc19ddf64ff73efe80b0 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -262,7 +262,7 @@ union bpf_attr {
                __u32           kern_version;   /* checked when prog_type=kprobe */
                __u32           prog_flags;
                char            prog_name[BPF_OBJ_NAME_LEN];
-               __u32           prog_target_ifindex;    /* ifindex of netdev to prep for */
+               __u32           prog_ifindex;   /* ifindex of netdev to prep for */
        };
 
        struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -897,10 +897,6 @@ enum sk_action {
 
 #define BPF_TAG_SIZE   8
 
-enum bpf_prog_status {
-       BPF_PROG_STATUS_DEV_BOUND       = (1 << 0),
-};
-
 struct bpf_prog_info {
        __u32 type;
        __u32 id;
@@ -914,8 +910,6 @@ struct bpf_prog_info {
        __u32 nr_map_ids;
        __aligned_u64 map_ids;
        char name[BPF_OBJ_NAME_LEN];
-       __u32 ifindex;
-       __u32 status;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index aa50113ebe5b0bec825ac29ddc8a37fc3a9d90b6..1a6fee974116a406deb077bd8be5585e5c4591cb 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -47,6 +47,7 @@
 #define OPENPROM_SUPER_MAGIC   0x9fa1
 #define QNX4_SUPER_MAGIC       0x002f          /* qnx4 fs detection */
 #define QNX6_SUPER_MAGIC       0x68191122      /* qnx6 fs detection */
+#define AFS_FS_MAGIC           0x6B414653
 
 #define REISERFS_SUPER_MAGIC   0x52654973      /* used by gcc */
                                        /* used by file system utilities that

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 6a2c5ea7e9c4e04264ddd80de963dc7ba1f8fede..af3cc2f4e1ad00dff0e011a4e94e0905d085d0ca 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -537,6 +537,9 @@ enum {
        TCA_NETEM_ECN,
        TCA_NETEM_RATE64,
        TCA_NETEM_PAD,
+       TCA_NETEM_LATENCY64,
+       TCA_NETEM_JITTER64,
+       TCA_NETEM_SLOT,
        __TCA_NETEM_MAX,
 };
 
@@ -574,6 +577,13 @@ struct tc_netem_rate {
        __s32   cell_overhead;
 };
 
+struct tc_netem_slot {
+       __s64   min_delay; /* nsec */
+       __s64   max_delay;
+       __s32   max_packets;
+       __s32   max_bytes;
+};
+
 enum {
        NETEM_LOSS_UNSPEC,
        NETEM_LOSS_GI,          /* General Intuitive - 4 state model */

diff --git a/include/uapi/linux/seg6.h b/include/uapi/linux/seg6.h
index 3f7be853af9a88d70b115f2efd9c8449f42b3737..329163e4a08d270ec84bc917f94b4e1c9078e105 100644 (file)
--- a/include/uapi/linux/seg6.h
+++ b/include/uapi/linux/seg6.h
@@ -26,9 +26,9 @@ struct ipv6_sr_hdr {
        __u8    hdrlen;
        __u8    type;
        __u8    segments_left;
-       __u8    first_segment;
+       __u8    first_segment; /* Represents the last_entry field of SRH */
        __u8    flags;
-       __u16   reserved;
+       __u16   tag;
 
        struct in6_addr segments[0];
 };