Update kernel headers

Update kernel headers to commit:
bfbae2eafe05 ("Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 9fdd9c740c75f3b6439f95a25ae28b31790cd9b1..031c4b4c32fd95dfea46c079be0f983640941b80 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -267,6 +267,7 @@ enum bpf_attach_type {
 #define BPF_ANY                0 /* create new element or update existing */
 #define BPF_NOEXIST    1 /* create new element if it didn't exist */
 #define BPF_EXIST      2 /* update existing element */
+#define BPF_F_LOCK     4 /* spin_lock-ed map_lookup/map_update */
 
 /* flags for BPF_MAP_CREATE command */
 #define BPF_F_NO_PREALLOC      (1U << 0)
@@ -2422,7 +2423,9 @@ union bpf_attr {
        FN(map_peek_elem),              \
        FN(msg_push_data),              \
        FN(msg_pop_data),               \
-       FN(rc_pointer_rel),
+       FN(rc_pointer_rel),             \
+       FN(spin_lock),                  \
+       FN(spin_unlock),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
@@ -3056,4 +3059,7 @@ struct bpf_line_info {
        __u32   line_col;
 };
 
+struct bpf_spin_lock {
+       __u32   val;
+};
 #endif /* __LINUX_BPF_H__ */

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index d0a33d79dc221379ae23fba1bca40034b65417f5..d51b59a7b8ee5863c55e2aa4a7593c53cacbd6f4 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -89,6 +89,13 @@ enum devlink_command {
        DEVLINK_CMD_REGION_DEL,
        DEVLINK_CMD_REGION_READ,
 
+       DEVLINK_CMD_PORT_PARAM_GET,     /* can dump */
+       DEVLINK_CMD_PORT_PARAM_SET,
+       DEVLINK_CMD_PORT_PARAM_NEW,
+       DEVLINK_CMD_PORT_PARAM_DEL,
+
+       DEVLINK_CMD_INFO_GET,           /* can dump */
+
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -285,6 +292,16 @@ enum devlink_attr {
        DEVLINK_ATTR_REGION_CHUNK_ADDR,         /* u64 */
        DEVLINK_ATTR_REGION_CHUNK_LEN,          /* u64 */
 
+       DEVLINK_ATTR_INFO_DRIVER_NAME,          /* string */
+       DEVLINK_ATTR_INFO_SERIAL_NUMBER,        /* string */
+       DEVLINK_ATTR_INFO_VERSION_FIXED,        /* nested */
+       DEVLINK_ATTR_INFO_VERSION_RUNNING,      /* nested */
+       DEVLINK_ATTR_INFO_VERSION_STORED,       /* nested */
+       DEVLINK_ATTR_INFO_VERSION_NAME,         /* string */
+       DEVLINK_ATTR_INFO_VERSION_VALUE,        /* string */
+
+       DEVLINK_ATTR_SB_POOL_CELL_SIZE,         /* u32 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index e9970b69d56075556c22754579ec3265bfb0fa9e..c4bce0a2011c15c85f518bb44755c9af6788ee39 100644 (file)
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -59,6 +59,10 @@
 
 typedef __s32 sctp_assoc_t;
 
+#define SCTP_FUTURE_ASSOC      0
+#define SCTP_CURRENT_ASSOC     1
+#define SCTP_ALL_ASSOC         2
+
 /* The following symbols come from the Sockets API Extensions for
  * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
  */