Update kernel headers to 4.16.0-rc4+

Update kernel headers to commit 08a24239cd46
("Merge branch 'hns3-next'")

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 40b08520a369d70fa6262bd339aa4b09d573b101..19817e3d52e8f5bf9926190e0f25bb8e77c30fdf 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -800,6 +800,7 @@ enum bpf_func_id {
 /* BPF_FUNC_skb_set_tunnel_key flags. */
 #define BPF_F_ZERO_CSUM_TX             (1ULL << 1)
 #define BPF_F_DONT_FRAGMENT            (1ULL << 2)
+#define BPF_F_SEQ_NUMBER               (1ULL << 3)
 
 /* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
  * BPF_FUNC_perf_event_read_value flags.

diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h
index 77d90ae381149de044bbd6034a380ec626c8e4e4..232df14e1287a3297716f0c16a0632194a189d50 100644 (file)
--- a/include/uapi/linux/fib_rules.h
+++ b/include/uapi/linux/fib_rules.h
@@ -35,6 +35,11 @@ struct fib_rule_uid_range {
        __u32           end;
 };
 
+struct fib_rule_port_range {
+       __u16           start;
+       __u16           end;
+};
+
 enum {
        FRA_UNSPEC,
        FRA_DST,        /* destination address */
@@ -59,6 +64,9 @@ enum {
        FRA_L3MDEV,     /* iif or oif is l3mdev goto its table */
        FRA_UID_RANGE,  /* UID range */
        FRA_PROTOCOL,   /* Originator of the rule */
+       FRA_IP_PROTO,   /* ip proto */
+       FRA_SPORT_RANGE, /* sport */
+       FRA_DPORT_RANGE, /* dport */
        __FRA_MAX
 };
 

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 64309a2b73cb326c74200e3ffda62f2ff7f9258e..1e1ed65ccad88a60d0bf8cffe67e01bcbd8ab599 100644 (file)
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -260,6 +260,19 @@ struct sctp_nxtinfo {
        sctp_assoc_t nxt_assoc_id;
 };
 
+/* 5.3.7 SCTP PR-SCTP Information Structure (SCTP_PRINFO)
+ *
+ *   This cmsghdr structure specifies SCTP options for sendmsg().
+ *
+ *   cmsg_level    cmsg_type      cmsg_data[]
+ *   ------------  ------------   -------------------
+ *   IPPROTO_SCTP  SCTP_PRINFO    struct sctp_prinfo
+ */
+struct sctp_prinfo {
+       __u16 pr_policy;
+       __u32 pr_value;
+};
+
 /*
  *  sinfo_flags: 16 bits (unsigned integer)
  *
@@ -271,6 +284,8 @@ enum sctp_sinfo_flags {
        SCTP_ADDR_OVER          = (1 << 1), /* Override the primary destination. */
        SCTP_ABORT              = (1 << 2), /* Send an ABORT message to the peer. */
        SCTP_SACK_IMMEDIATELY   = (1 << 3), /* SACK should be sent without delay. */
+       /* 2 bits here have been used by SCTP_PR_SCTP_MASK */
+       SCTP_SENDALL            = (1 << 6),
        SCTP_NOTIFICATION       = MSG_NOTIFICATION, /* Next message is not user msg but notification. */
        SCTP_EOF                = MSG_FIN,  /* Initiate graceful shutdown process. */
 };
@@ -293,6 +308,14 @@ typedef enum sctp_cmsg_type {
 #define SCTP_RCVINFO   SCTP_RCVINFO
        SCTP_NXTINFO,           /* 5.3.6 SCTP Next Receive Information Structure */
 #define SCTP_NXTINFO   SCTP_NXTINFO
+       SCTP_PRINFO,            /* 5.3.7 SCTP PR-SCTP Information Structure */
+#define SCTP_PRINFO    SCTP_PRINFO
+       SCTP_AUTHINFO,          /* 5.3.8 SCTP AUTH Information Structure (RESERVED) */
+#define SCTP_AUTHINFO  SCTP_AUTHINFO
+       SCTP_DSTADDRV4,         /* 5.3.9 SCTP Destination IPv4 Address Structure */
+#define SCTP_DSTADDRV4 SCTP_DSTADDRV4
+       SCTP_DSTADDRV6,         /* 5.3.10 SCTP Destination IPv6 Address Structure */
+#define SCTP_DSTADDRV6 SCTP_DSTADDRV6
 } sctp_cmsg_t;
 
 /*

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 3dc9e4a337f269c732cce692cd9ed7766a77afab..6bf453cf08296e6f7a4da7391bd016e599e76896 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -241,6 +241,8 @@ enum {
        TCP_NLA_MIN_RTT,        /* minimum RTT */
        TCP_NLA_RECUR_RETRANS,  /* Recurring retransmits for the current pkt */
        TCP_NLA_DELIVERY_RATE_APP_LMT, /* delivery rate application limited ? */
+       TCP_NLA_SNDQ_SIZE,      /* Data (bytes) pending in send queue */
+       TCP_NLA_CA_STATE,       /* ca_state of socket */
 
 };